Fixed compiler error in 8139too-2.6.37-ethercat.c.
authorFlorian Pose <fp@igh-essen.com>
Fri, 13 May 2011 15:33:16 +0200
changeset 2067 19732da2cf86
parent 2065 4d8c9a441ef6
child 2068 3001f6523e63
Fixed compiler error in 8139too-2.6.37-ethercat.c.
devices/8139too-2.6.37-ethercat.c
--- a/devices/8139too-2.6.37-ethercat.c	Thu May 12 16:38:48 2011 +0200
+++ b/devices/8139too-2.6.37-ethercat.c	Fri May 13 15:33:16 2011 +0200
@@ -1784,7 +1784,7 @@
 	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 @@
 		    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;