From 00411676b267d975d561414817b556df5dbff4be Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 13 May 2011 15:33:16 +0200
Subject: [PATCH] Fixed compiler error in 8139too-2.6.37-ethercat.c.
--HG--
branch : stable-1.5
---
devices/8139too-2.6.37-ethercat.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/devices/8139too-2.6.37-ethercat.c b/devices/8139too-2.6.37-ethercat.c
index 4738f615..61a58714 100644
--- a/devices/8139too-2.6.37-ethercat.c
+++ b/devices/8139too-2.6.37-ethercat.c
@@ -1784,7 +1784,7 @@ static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,
void __iomem *ioaddr = tp->mmio_addr;
unsigned int entry;
unsigned int len = skb->len;
- unsigned long flags;
+ unsigned long flags = 0;
/* Calculate the next Tx descriptor entry. */
entry = tp->cur_tx % NUM_TX_DESC;
@@ -2661,8 +2661,8 @@ static void __set_rx_mode (struct net_device *dev)
AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
AcceptAllPhys;
mc_filter[1] = mc_filter[0] = 0xffffffff;
- } else if ((dev->mc_count > multicast_filter_limit)
- || (dev->flags & IFF_ALLMULTI)) {
+ } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
+ (dev->flags & IFF_ALLMULTI)) {
/* Too many to filter perfectly -- accept all multicasts. */
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
mc_filter[1] = mc_filter[0] = 0xffffffff;
--
GitLab