diff -r 8b9be05873c1 -r 5726bd931ecb devices/8139too-2.6.36-ethercat.c --- a/devices/8139too-2.6.36-ethercat.c Mon Jul 23 12:23:42 2012 +0200 +++ b/devices/8139too-2.6.36-ethercat.c Mon Jul 23 15:32:42 2012 +0200 @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id$ + * $Id: 8139too-2.6.36-ethercat.c,v 4d8c9a441ef6 2011/05/12 14:38:48 fp $ * * Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH * @@ -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;