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/pcmcia | |
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/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index dcbb11ab98db..e5cb6b1f0ebd 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -1061,7 +1061,6 @@ static int el3_rx(struct net_device *dev, int worklimit) | |||
1061 | ((pkt_len+3)>>2)); | 1061 | ((pkt_len+3)>>2)); |
1062 | skb->protocol = eth_type_trans(skb, dev); | 1062 | skb->protocol = eth_type_trans(skb, dev); |
1063 | netif_rx(skb); | 1063 | netif_rx(skb); |
1064 | dev->last_rx = jiffies; | ||
1065 | dev->stats.rx_packets++; | 1064 | dev->stats.rx_packets++; |
1066 | dev->stats.rx_bytes += pkt_len; | 1065 | dev->stats.rx_bytes += pkt_len; |
1067 | } else { | 1066 | } else { |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 5882109be777..73ecc657999d 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -883,7 +883,6 @@ static int el3_rx(struct net_device *dev) | |||
883 | (pkt_len+3)>>2); | 883 | (pkt_len+3)>>2); |
884 | skb->protocol = eth_type_trans(skb, dev); | 884 | skb->protocol = eth_type_trans(skb, dev); |
885 | netif_rx(skb); | 885 | netif_rx(skb); |
886 | dev->last_rx = jiffies; | ||
887 | dev->stats.rx_packets++; | 886 | dev->stats.rx_packets++; |
888 | dev->stats.rx_bytes += pkt_len; | 887 | dev->stats.rx_bytes += pkt_len; |
889 | } else { | 888 | } else { |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 889f1bdb0853..2aca8df34970 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -1492,7 +1492,6 @@ static void ei_receive(struct net_device *dev) | |||
1492 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); | 1492 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); |
1493 | skb->protocol=eth_type_trans(skb,dev); | 1493 | skb->protocol=eth_type_trans(skb,dev); |
1494 | netif_rx(skb); | 1494 | netif_rx(skb); |
1495 | dev->last_rx = jiffies; | ||
1496 | dev->stats.rx_packets++; | 1495 | dev->stats.rx_packets++; |
1497 | dev->stats.rx_bytes += pkt_len; | 1496 | dev->stats.rx_bytes += pkt_len; |
1498 | if (pkt_stat & ENRSR_PHY) | 1497 | if (pkt_stat & ENRSR_PHY) |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 465e4ad363ce..e4f8fe3c5dae 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -1035,7 +1035,6 @@ static void fjn_rx(struct net_device *dev) | |||
1035 | #endif | 1035 | #endif |
1036 | 1036 | ||
1037 | netif_rx(skb); | 1037 | netif_rx(skb); |
1038 | dev->last_rx = jiffies; | ||
1039 | lp->stats.rx_packets++; | 1038 | lp->stats.rx_packets++; |
1040 | lp->stats.rx_bytes += pkt_len; | 1039 | lp->stats.rx_bytes += pkt_len; |
1041 | } | 1040 | } |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 35a1d1024c50..ec7c588c9ae5 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -1192,7 +1192,6 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt) | |||
1192 | 1192 | ||
1193 | netif_rx(skb); /* Send the packet to the upper (protocol) layers. */ | 1193 | netif_rx(skb); /* Send the packet to the upper (protocol) layers. */ |
1194 | 1194 | ||
1195 | dev->last_rx = jiffies; | ||
1196 | lp->linux_stats.rx_packets++; | 1195 | lp->linux_stats.rx_packets++; |
1197 | lp->linux_stats.rx_bytes += pkt_len; | 1196 | lp->linux_stats.rx_bytes += pkt_len; |
1198 | outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */ | 1197 | outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */ |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index c45c3064fee6..fef7e1861d6a 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1242,7 +1242,6 @@ xirc2ps_interrupt(int irq, void *dev_id) | |||
1242 | } | 1242 | } |
1243 | skb->protocol = eth_type_trans(skb, dev); | 1243 | skb->protocol = eth_type_trans(skb, dev); |
1244 | netif_rx(skb); | 1244 | netif_rx(skb); |
1245 | dev->last_rx = jiffies; | ||
1246 | lp->stats.rx_packets++; | 1245 | lp->stats.rx_packets++; |
1247 | lp->stats.rx_bytes += pktlen; | 1246 | lp->stats.rx_bytes += pktlen; |
1248 | if (!(rsr & PhyPkt)) | 1247 | if (!(rsr & PhyPkt)) |