aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139too.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r--drivers/net/8139too.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index f0d23de32967..4ba72933f0da 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1716,8 +1716,6 @@ static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,
1716 RTL_W32_F (TxStatus0 + (entry * sizeof (u32)), 1716 RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
1717 tp->tx_flag | max(len, (unsigned int)ETH_ZLEN)); 1717 tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
1718 1718
1719 dev->trans_start = jiffies;
1720
1721 tp->cur_tx++; 1719 tp->cur_tx++;
1722 1720
1723 if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx) 1721 if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
@@ -2503,11 +2501,11 @@ static void __set_rx_mode (struct net_device *dev)
2503 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; 2501 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
2504 mc_filter[1] = mc_filter[0] = 0xffffffff; 2502 mc_filter[1] = mc_filter[0] = 0xffffffff;
2505 } else { 2503 } else {
2506 struct dev_mc_list *mclist; 2504 struct netdev_hw_addr *ha;
2507 rx_mode = AcceptBroadcast | AcceptMyPhys; 2505 rx_mode = AcceptBroadcast | AcceptMyPhys;
2508 mc_filter[1] = mc_filter[0] = 0; 2506 mc_filter[1] = mc_filter[0] = 0;
2509 netdev_for_each_mc_addr(mclist, dev) { 2507 netdev_for_each_mc_addr(ha, dev) {
2510 int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; 2508 int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
2511 2509
2512 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); 2510 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
2513 rx_mode |= AcceptMulticast; 2511 rx_mode |= AcceptMulticast;