diff options
Diffstat (limited to 'drivers/net/tc35815.c')
-rw-r--r-- | drivers/net/tc35815.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 49bd84c0d583..be08b75dbc15 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1357,8 +1357,6 @@ static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1357 | } | 1357 | } |
1358 | lp->tfd_start = (lp->tfd_start + 1) % TX_FD_NUM; | 1358 | lp->tfd_start = (lp->tfd_start + 1) % TX_FD_NUM; |
1359 | 1359 | ||
1360 | dev->trans_start = jiffies; | ||
1361 | |||
1362 | /* If we just used up the very last entry in the | 1360 | /* If we just used up the very last entry in the |
1363 | * TX ring on this device, tell the queueing | 1361 | * TX ring on this device, tell the queueing |
1364 | * layer to send no more. | 1362 | * layer to send no more. |
@@ -1954,16 +1952,16 @@ tc35815_set_multicast_list(struct net_device *dev) | |||
1954 | /* Disable promiscuous mode, use normal mode. */ | 1952 | /* Disable promiscuous mode, use normal mode. */ |
1955 | tc_writel(CAM_CompEn | CAM_BroadAcc | CAM_GroupAcc, &tr->CAM_Ctl); | 1953 | tc_writel(CAM_CompEn | CAM_BroadAcc | CAM_GroupAcc, &tr->CAM_Ctl); |
1956 | } else if (!netdev_mc_empty(dev)) { | 1954 | } else if (!netdev_mc_empty(dev)) { |
1957 | struct dev_mc_list *cur_addr; | 1955 | struct netdev_hw_addr *ha; |
1958 | int i; | 1956 | int i; |
1959 | int ena_bits = CAM_Ena_Bit(CAM_ENTRY_SOURCE); | 1957 | int ena_bits = CAM_Ena_Bit(CAM_ENTRY_SOURCE); |
1960 | 1958 | ||
1961 | tc_writel(0, &tr->CAM_Ctl); | 1959 | tc_writel(0, &tr->CAM_Ctl); |
1962 | /* Walk the address list, and load the filter */ | 1960 | /* Walk the address list, and load the filter */ |
1963 | i = 0; | 1961 | i = 0; |
1964 | netdev_for_each_mc_addr(cur_addr, dev) { | 1962 | netdev_for_each_mc_addr(ha, dev) { |
1965 | /* entry 0,1 is reserved. */ | 1963 | /* entry 0,1 is reserved. */ |
1966 | tc35815_set_cam_entry(dev, i + 2, cur_addr->dmi_addr); | 1964 | tc35815_set_cam_entry(dev, i + 2, ha->addr); |
1967 | ena_bits |= CAM_Ena_Bit(i + 2); | 1965 | ena_bits |= CAM_Ena_Bit(i + 2); |
1968 | i++; | 1966 | i++; |
1969 | } | 1967 | } |