Skip to content
Snippets Groups Projects
Commit 00411676 authored by Florian Pose's avatar Florian Pose
Browse files

Fixed compiler error in 8139too-2.6.37-ethercat.c.

--HG--
branch : stable-1.5
parent fecb5fbe
No related branches found
No related tags found
No related merge requests found
...@@ -1784,7 +1784,7 @@ static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb, ...@@ -1784,7 +1784,7 @@ static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,
void __iomem *ioaddr = tp->mmio_addr; void __iomem *ioaddr = tp->mmio_addr;
unsigned int entry; unsigned int entry;
unsigned int len = skb->len; unsigned int len = skb->len;
unsigned long flags; unsigned long flags = 0;
/* Calculate the next Tx descriptor entry. */ /* Calculate the next Tx descriptor entry. */
entry = tp->cur_tx % NUM_TX_DESC; entry = tp->cur_tx % NUM_TX_DESC;
...@@ -2661,8 +2661,8 @@ static void __set_rx_mode (struct net_device *dev) ...@@ -2661,8 +2661,8 @@ static void __set_rx_mode (struct net_device *dev)
AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
AcceptAllPhys; AcceptAllPhys;
mc_filter[1] = mc_filter[0] = 0xffffffff; mc_filter[1] = mc_filter[0] = 0xffffffff;
} else if ((dev->mc_count > multicast_filter_limit) } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
|| (dev->flags & IFF_ALLMULTI)) { (dev->flags & IFF_ALLMULTI)) {
/* Too many to filter perfectly -- accept all multicasts. */ /* Too many to filter perfectly -- accept all multicasts. */
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
mc_filter[1] = mc_filter[0] = 0xffffffff; mc_filter[1] = mc_filter[0] = 0xffffffff;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment