diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:55:50 -0700 |
| commit | 61cca8c72eb284e80876bafdea057055f6e793e4 (patch) | |
| tree | 5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/usb/net/rtl8150.c | |
| parent | e494f6333bef20fd9d8689062260c5d0136a3ea0 (diff) | |
| parent | e254e9bff5283aad1af6d74d2a312ee011b84d61 (diff) | |
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
| -rw-r--r-- | drivers/usb/net/rtl8150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 8fb223385f2..626b016addf 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c @@ -667,7 +667,7 @@ static void rtl8150_set_multicast(struct net_device *netdev) if (netdev->flags & IFF_PROMISC) { dev->rx_creg |= cpu_to_le16(0x0001); info("%s: promiscuous mode", netdev->name); - } else if ((netdev->mc_count > multicast_filter_limit) || + } else if (netdev->mc_count || (netdev->flags & IFF_ALLMULTI)) { dev->rx_creg &= cpu_to_le16(0xfffe); dev->rx_creg |= cpu_to_le16(0x0002); |