diff options
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index ec94ddf01f56..593e01f64e9b 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -42,9 +42,9 @@ static int max_interrupt_work = 20; | |||
42 | 42 | ||
43 | /* Set the copy breakpoint for the copy-only-tiny-frames scheme. | 43 | /* Set the copy breakpoint for the copy-only-tiny-frames scheme. |
44 | Setting to > 1518 effectively disables this feature. */ | 44 | Setting to > 1518 effectively disables this feature. */ |
45 | #if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \ | 45 | #if defined(__alpha__) || defined(__arm__) || defined(__hppa__) || \ |
46 | || defined(CONFIG_SPARC) || defined(__ia64__) \ | 46 | defined(CONFIG_SPARC) || defined(__ia64__) || \ |
47 | || defined(__sh__) || defined(__mips__) | 47 | defined(__sh__) || defined(__mips__) |
48 | static int rx_copybreak = 1518; | 48 | static int rx_copybreak = 1518; |
49 | #else | 49 | #else |
50 | static int rx_copybreak; | 50 | static int rx_copybreak; |
@@ -1683,8 +1683,8 @@ static void rhine_set_rx_mode(struct net_device *dev) | |||
1683 | rx_mode = 0x1C; | 1683 | rx_mode = 0x1C; |
1684 | iowrite32(0xffffffff, ioaddr + MulticastFilter0); | 1684 | iowrite32(0xffffffff, ioaddr + MulticastFilter0); |
1685 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); | 1685 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); |
1686 | } else if ((dev->mc_count > multicast_filter_limit) | 1686 | } else if ((dev->mc_count > multicast_filter_limit) || |
1687 | || (dev->flags & IFF_ALLMULTI)) { | 1687 | (dev->flags & IFF_ALLMULTI)) { |
1688 | /* Too many to match, or accept all multicasts. */ | 1688 | /* Too many to match, or accept all multicasts. */ |
1689 | iowrite32(0xffffffff, ioaddr + MulticastFilter0); | 1689 | iowrite32(0xffffffff, ioaddr + MulticastFilter0); |
1690 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); | 1690 | iowrite32(0xffffffff, ioaddr + MulticastFilter1); |