| Message ID | f470381d8e466741c71a38e5ad396c3850d10721.1402826534.git.panweiping3@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Weiping Pan <panweiping3@gmail.com> Date: Sun, 15 Jun 2014 18:05:09 +0800 > In __dev_open(), it already calls dev_set_rx_mode(). > and dev_set_rx_mode() has no effect for a net device which does not have > IFF_UP flag set. > > So the call of dev_set_rx_mode() is duplicate in __dev_change_flags(). > > Signed-off-by: Weiping Pan <panweiping3@gmail.com> > --- > net/core/dev.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/net/core/dev.c b/net/core/dev.c > index 30eedf6..002678f 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -5434,9 +5434,6 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) > ret = 0; > if ((old_flags ^ flags) & IFF_UP) { /* Bit is different ? */ > ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev); > - > - if (!ret) > - dev_set_rx_mode(dev); > } A single line statement is what we end up with, so kill the curly braces as they are no longer necessary. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index 30eedf6..002678f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5434,9 +5434,6 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) ret = 0; if ((old_flags ^ flags) & IFF_UP) { /* Bit is different ? */ ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev); - - if (!ret) - dev_set_rx_mode(dev); } if ((flags ^ dev->gflags) & IFF_PROMISC) {
In __dev_open(), it already calls dev_set_rx_mode(). and dev_set_rx_mode() has no effect for a net device which does not have IFF_UP flag set. So the call of dev_set_rx_mode() is duplicate in __dev_change_flags(). Signed-off-by: Weiping Pan <panweiping3@gmail.com> --- net/core/dev.c | 3 --- 1 file changed, 3 deletions(-)