From: Thomas Graf Date: Tue, 5 Jun 2007 23:03:03 +0000 (-0700) Subject: [NET]: Avoid duplicate netlink notification when changing link state X-Git-Tag: v2.6.22-rc5~95^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c355f532dd43036622e1880c114773463bafd23;p=linux-2.6-omap-h63xx.git [NET]: Avoid duplicate netlink notification when changing link state When changing the link state from userspace not affecting any other flags. Two duplicate notification are being sent, once as action in the NETDEV_UP/NETDEV_DOWN notification chain and a second time when comparing old and new device flags after the change has been completed. Although harmless, the duplicates should be avoided. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller --- diff --git a/net/core/dev.c b/net/core/dev.c index 5a7f20f7857..26090621ea6 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2577,7 +2577,7 @@ unsigned dev_get_flags(const struct net_device *dev) int dev_change_flags(struct net_device *dev, unsigned flags) { - int ret; + int ret, changes; int old_flags = dev->flags; /* @@ -2632,8 +2632,10 @@ int dev_change_flags(struct net_device *dev, unsigned flags) dev_set_allmulti(dev, inc); } - if (old_flags ^ dev->flags) - rtmsg_ifinfo(RTM_NEWLINK, dev, old_flags ^ dev->flags); + /* Exclude state transition flags, already notified */ + changes = (old_flags ^ dev->flags) & ~(IFF_UP | IFF_RUNNING); + if (changes) + rtmsg_ifinfo(RTM_NEWLINK, dev, changes); return ret; }