diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-05-20 14:36:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-16 13:19:55 -0700 |
| commit | 6600b220d4e12ec47b4ffc710840c98940c1bb8e (patch) | |
| tree | 0de9bb44b6bc9b91698a071f0167c1ce579bd985 /net | |
| parent | 5c1c9ddc6d50656beef56b03cf87510f1a01e5ef (diff) | |
net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
[ upstream commit: 0e91796eb46e29edc791131c832a2232bcaed9dd ]
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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'net')
| -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 460e7f99ce3..37ffd7a378c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3132,7 +3132,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags) * Load in the correct multicast list now the flags have changed. */ - if (dev->change_rx_flags && (dev->flags ^ flags) & IFF_MULTICAST) + if (dev->change_rx_flags && (old_flags ^ flags) & IFF_MULTICAST) dev->change_rx_flags(dev, IFF_MULTICAST); dev_set_rx_mode(dev); |