From aa4b5093fa73a56f1f358b0473d36b433cf4c12f Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 5 Jun 2007 16:03:03 -0700 Subject: [PATCH] --- yaml --- r: 57438 b: refs/heads/master c: 7c355f532dd43036622e1880c114773463bafd23 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 57c1109f3bb1..ba6fa0e70413 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df2bc459a3ad71f8b44c358bf7169acf9caf4acd +refs/heads/master: 7c355f532dd43036622e1880c114773463bafd23 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 5a7f20f78574..26090621ea6b 100644 --- a/trunk/net/core/dev.c +++ b/trunk/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; }