public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Roland Dreier <roland@topspin.com>
To: davem@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] fix up RTM_SETLINK handling
Date: 14 Jan 2003 23:01:00 -0800	[thread overview]
Message-ID: <52smvukic3.fsf@topspin.com> (raw)

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;
 }

             reply	other threads:[~2003-01-15  6:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-01-15  7:01 Roland Dreier [this message]
2003-01-16  0:07 ` [PATCH] fix up RTM_SETLINK handling David S. Miller
2003-01-16  0:22   ` Roland Dreier
2003-01-16  0:13     ` David S. Miller
2003-01-16  1:24       ` Roland Dreier
2003-01-16  1:23         ` David S. Miller
2003-01-16  1:39           ` Roland Dreier
2003-01-16  7:37             ` David S. Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52smvukic3.fsf@topspin.com \
    --to=roland@topspin.com \
    --cc=davem@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox