net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
authorDavid Woodhouse <dwmw2@infradead.org>
Tue, 20 May 2008 21:36:14 +0000 (14:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 May 2008 21:36:14 +0000 (14:36 -0700)
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>
net/core/dev.c

index ce88c0d3e35470d1c052a0ed8b92d2dbd4a7f5f3..58296307787746e99da8bdcfe006b9b39af32de1 100644 (file)
@@ -3141,7 +3141,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);