This patch fixes up some oversights I noticed with my code for
handling RTM_SETLINK messages and brings do_setlink() more in line
with SIOCSIFHWADDR handling in net/core/dev.c. In particular, the
patch adds some checks that were missing, uses the set_mac_address
method rather than memcpy() directly into dev->dev_addr, and calls the
netdev notifier chain.
To call the netdev notifier chain I had to make netdev_chain not be
static. I added the declaration to <linux/netdevice.h> but I am open
to other ways to give rtnetlink.c access to netdev_chain.
Best,
Roland
include/linux/netdevice.h | 1 +
net/core/dev.c | 2 +-
net/core/rtnetlink.c | 18 ++++++++++++++++--
3 files changed, 18 insertions(+), 3 deletions(-)
===== include/linux/netdevice.h 1.27 vs edited =====
--- 1.27/include/linux/netdevice.h Tue Jan 7 14:33:37 2003
+++ edited/include/linux/netdevice.h Tue Jan 14 19:19:59 2003
@@ -462,6 +462,7 @@
extern struct net_device loopback_dev; /* The loopback */
extern struct net_device *dev_base; /* All devices */
extern rwlock_t dev_base_lock; /* Device list lock */
+extern struct notifier_block *netdev_chain;
extern int netdev_boot_setup_add(char *name, struct ifmap *map);
extern int netdev_boot_setup_check(struct net_device *dev);
===== net/core/dev.c 1.52 vs edited =====
--- 1.52/net/core/dev.c Tue Jan 7 14:33:37 2003
+++ edited/net/core/dev.c Tue Jan 14 19:07:44 2003
@@ -188,7 +188,7 @@
* Our notifier list
*/
-static struct notifier_block *netdev_chain;
+struct notifier_block *netdev_chain;
/*
* Device drivers call our routines to queue packets here. We empty the
===== net/core/rtnetlink.c 1.6 vs edited =====
--- 1.6/net/core/rtnetlink.c Tue Jan 7 01:05:42 2003
+++ edited/net/core/rtnetlink.c Tue Jan 14 19:36:43 2003
@@ -234,10 +234,20 @@
err = -EINVAL;
if (ida[IFLA_ADDRESS - 1]) {
+ if (!dev->set_mac_address) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+ if (!netif_device_present(dev)) {
+ err = -ENODEV;
+ goto out;
+ }
if (ida[IFLA_ADDRESS - 1]->rta_len != RTA_LENGTH(dev->addr_len))
goto out;
- memcpy(dev->dev_addr, RTA_DATA(ida[IFLA_ADDRESS - 1]),
- dev->addr_len);
+
+ err = dev->set_mac_address(dev, RTA_DATA(ida[IFLA_ADDRESS - 1]));
+ if (err)
+ goto out;
}
if (ida[IFLA_BROADCAST - 1]) {
@@ -250,6 +260,10 @@
err = 0;
out:
+ if (!err)
+ notifier_call_chain(&netdev_chain,
+ NETDEV_CHANGEADDR, dev);
+
dev_put(dev);
return err;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jan 15 2003 - 22:00:53 EST