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/wan/sbni.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/wan/sbni.c')
-rw-r--r-- | drivers/net/wan/sbni.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index ee51b6a5e605..6db063e2d5bb 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -1013,13 +1013,11 @@ indicate_pkt( struct net_device *dev ) | |||
1013 | #ifdef CONFIG_SBNI_MULTILINE | 1013 | #ifdef CONFIG_SBNI_MULTILINE |
1014 | skb->protocol = eth_type_trans( skb, nl->master ); | 1014 | skb->protocol = eth_type_trans( skb, nl->master ); |
1015 | netif_rx( skb ); | 1015 | netif_rx( skb ); |
1016 | dev->last_rx = jiffies; | ||
1017 | ++((struct net_local *) nl->master->priv)->stats.rx_packets; | 1016 | ++((struct net_local *) nl->master->priv)->stats.rx_packets; |
1018 | ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos; | 1017 | ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos; |
1019 | #else | 1018 | #else |
1020 | skb->protocol = eth_type_trans( skb, dev ); | 1019 | skb->protocol = eth_type_trans( skb, dev ); |
1021 | netif_rx( skb ); | 1020 | netif_rx( skb ); |
1022 | dev->last_rx = jiffies; | ||
1023 | ++nl->stats.rx_packets; | 1021 | ++nl->stats.rx_packets; |
1024 | nl->stats.rx_bytes += nl->inppos; | 1022 | nl->stats.rx_bytes += nl->inppos; |
1025 | #endif | 1023 | #endif |