diff options
| author |   Peter Pan(潘卫平) <panweiping3@gmail.com> | 2014-06-16 21:57:22 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-06-17 15:30:54 -0700 |
| commit | d215d10f2d6bd41ce9d11a2707568bbb50d2c32e (patch) | |
| tree | ad419008829a94d61f01c8a2e83d567a238ad02e | |
| parent | mrf24j40: separate h/w init and add checkings (diff) | |
| download | linux-dev-d215d10f2d6bd41ce9d11a2707568bbb50d2c32e.tar.xz linux-dev-d215d10f2d6bd41ce9d11a2707568bbb50d2c32e.zip | |
net: delete duplicate dev_set_rx_mode() call
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 30eedf677913..a04b12f31e18 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5432,13 +5432,9 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) */ ret = 0; - if ((old_flags ^ flags) & IFF_UP) { /* Bit is different ? */ + if ((old_flags ^ flags) & IFF_UP) ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev); - if (!ret) - dev_set_rx_mode(dev); - } - if ((flags ^ dev->gflags) & IFF_PROMISC) { int inc = (flags & IFF_PROMISC) ? 1 : -1; unsigned int old_flags = dev->flags; |