diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/net/3c515.c | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'drivers/net/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 063b049ffe55..1e898b1c8068 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
| @@ -1536,7 +1536,7 @@ static void set_rx_mode(struct net_device *dev) | |||
| 1536 | pr_debug("%s: Setting promiscuous mode.\n", | 1536 | pr_debug("%s: Setting promiscuous mode.\n", |
| 1537 | dev->name); | 1537 | dev->name); |
| 1538 | new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm; | 1538 | new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm; |
| 1539 | } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) { | 1539 | } else if (!netdev_mc_empty(dev) || dev->flags & IFF_ALLMULTI) { |
| 1540 | new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast; | 1540 | new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast; |
| 1541 | } else | 1541 | } else |
| 1542 | new_mode = SetRxFilter | RxStation | RxBroadcast; | 1542 | new_mode = SetRxFilter | RxStation | RxBroadcast; |