From dcc34967313d283c42395986642f08e370f6dd94 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 20 May 2008 14:36:14 -0700
Subject: [PATCH] --- yaml --- r: 97097 b: refs/heads/master c:
 0e91796eb46e29edc791131c832a2232bcaed9dd h: refs/heads/master i:   97095:
 549f3d54616709e83d80db73161b716bad71191d v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bcdb1410c68d..e3141f663c2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2df824948d559ea818e03486a8583e42ea6ab37
+refs/heads/master: 0e91796eb46e29edc791131c832a2232bcaed9dd
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index ce88c0d3e354..582963077877 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -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);