diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-05-20 17:36:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-20 17:36:14 -0400 |
commit | 0e91796eb46e29edc791131c832a2232bcaed9dd (patch) | |
tree | e175a4b0de48e9e44b94e52dd634d38618193add /net/core/dev.c | |
parent | f2df824948d559ea818e03486a8583e42ea6ab37 (diff) |
net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
Am I just being particularly dim today, or can the call to
dev->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() never
happen?
We've just set dev->flags = flags & IFF_MULTICAST, effectively. So the
condition '(dev->flags ^ flags) & IFF_MULTICAST' is _never_ going to be
true.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ce88c0d3e354..582963077877 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3141,7 +3141,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags) | |||
3141 | * Load in the correct multicast list now the flags have changed. | 3141 | * Load in the correct multicast list now the flags have changed. |
3142 | */ | 3142 | */ |
3143 | 3143 | ||
3144 | if (dev->change_rx_flags && (dev->flags ^ flags) & IFF_MULTICAST) | 3144 | if (dev->change_rx_flags && (old_flags ^ flags) & IFF_MULTICAST) |
3145 | dev->change_rx_flags(dev, IFF_MULTICAST); | 3145 | dev->change_rx_flags(dev, IFF_MULTICAST); |
3146 | 3146 | ||
3147 | dev_set_rx_mode(dev); | 3147 | dev_set_rx_mode(dev); |