diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
commit | babcda74e9d96bb58fd9c6c5112dbdbff169e695 (patch) | |
tree | fcbe5e70f1fff01ad49504171e964c387a5ad7f8 /drivers/net/ipg.c | |
parent | ab2910921064b657610a3b501358a305e13087ea (diff) |
drivers/net: Kill now superfluous ->last_rx stores.
The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.
Drivers need not do it any more.
Some cases had to be skipped over because the drivers
were making use of the ->last_rx value themselves.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipg.c')
-rw-r--r-- | drivers/net/ipg.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 7373dafbb3f7..24c777aff5c6 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
@@ -1222,7 +1222,6 @@ static void ipg_nic_rx_with_start_and_end(struct net_device *dev, | |||
1222 | skb->protocol = eth_type_trans(skb, dev); | 1222 | skb->protocol = eth_type_trans(skb, dev); |
1223 | skb->ip_summed = CHECKSUM_NONE; | 1223 | skb->ip_summed = CHECKSUM_NONE; |
1224 | netif_rx(skb); | 1224 | netif_rx(skb); |
1225 | dev->last_rx = jiffies; | ||
1226 | sp->rx_buff[entry] = NULL; | 1225 | sp->rx_buff[entry] = NULL; |
1227 | } | 1226 | } |
1228 | 1227 | ||
@@ -1256,7 +1255,6 @@ static void ipg_nic_rx_with_start(struct net_device *dev, | |||
1256 | jumbo->skb = skb; | 1255 | jumbo->skb = skb; |
1257 | 1256 | ||
1258 | sp->rx_buff[entry] = NULL; | 1257 | sp->rx_buff[entry] = NULL; |
1259 | dev->last_rx = jiffies; | ||
1260 | } | 1258 | } |
1261 | 1259 | ||
1262 | static void ipg_nic_rx_with_end(struct net_device *dev, | 1260 | static void ipg_nic_rx_with_end(struct net_device *dev, |
@@ -1292,7 +1290,6 @@ static void ipg_nic_rx_with_end(struct net_device *dev, | |||
1292 | } | 1290 | } |
1293 | } | 1291 | } |
1294 | 1292 | ||
1295 | dev->last_rx = jiffies; | ||
1296 | jumbo->found_start = 0; | 1293 | jumbo->found_start = 0; |
1297 | jumbo->current_size = 0; | 1294 | jumbo->current_size = 0; |
1298 | jumbo->skb = NULL; | 1295 | jumbo->skb = NULL; |
@@ -1325,7 +1322,6 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev, | |||
1325 | skb->data, sp->rxfrag_size); | 1322 | skb->data, sp->rxfrag_size); |
1326 | } | 1323 | } |
1327 | } | 1324 | } |
1328 | dev->last_rx = jiffies; | ||
1329 | ipg_nic_rx_free_skb(dev); | 1325 | ipg_nic_rx_free_skb(dev); |
1330 | } | 1326 | } |
1331 | } else { | 1327 | } else { |
@@ -1494,11 +1490,6 @@ static int ipg_nic_rx(struct net_device *dev) | |||
1494 | * when processing completes. | 1490 | * when processing completes. |
1495 | */ | 1491 | */ |
1496 | netif_rx(skb); | 1492 | netif_rx(skb); |
1497 | |||
1498 | /* Record frame receive time (jiffies = Linux | ||
1499 | * kernel current time stamp). | ||
1500 | */ | ||
1501 | dev->last_rx = jiffies; | ||
1502 | } | 1493 | } |
1503 | 1494 | ||
1504 | /* Assure RX buffer is not reused by IPG. */ | 1495 | /* Assure RX buffer is not reused by IPG. */ |