diff options
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r-- | drivers/net/tokenring/3c359.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/ibmtr.c | 1 | ||||
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 1 | ||||
-rw-r--r-- | drivers/net/tokenring/olympic.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/smctr.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/tms380tr.c | 1 |
6 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index bf621328b601..87509a65b3bf 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
@@ -974,7 +974,6 @@ static void xl_rx(struct net_device *dev) | |||
974 | 974 | ||
975 | netif_rx(skb2) ; | 975 | netif_rx(skb2) ; |
976 | } /* if multiple buffers */ | 976 | } /* if multiple buffers */ |
977 | dev->last_rx = jiffies ; | ||
978 | } /* while packet to do */ | 977 | } /* while packet to do */ |
979 | 978 | ||
980 | /* Clear the updComplete interrupt */ | 979 | /* Clear the updComplete interrupt */ |
@@ -1571,7 +1570,6 @@ static void xl_arb_cmd(struct net_device *dev) | |||
1571 | * anyway. | 1570 | * anyway. |
1572 | */ | 1571 | */ |
1573 | 1572 | ||
1574 | dev->last_rx = jiffies ; | ||
1575 | /* Acknowledge interrupt, this tells nic we are done with the arb */ | 1573 | /* Acknowledge interrupt, this tells nic we are done with the arb */ |
1576 | writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; | 1574 | writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; |
1577 | 1575 | ||
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index ad978982eee4..9fd09938d45b 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -1822,7 +1822,6 @@ static void tr_rx(struct net_device *dev) | |||
1822 | skb->ip_summed = CHECKSUM_COMPLETE; | 1822 | skb->ip_summed = CHECKSUM_COMPLETE; |
1823 | } | 1823 | } |
1824 | netif_rx(skb); | 1824 | netif_rx(skb); |
1825 | dev->last_rx = jiffies; | ||
1826 | } /*tr_rx */ | 1825 | } /*tr_rx */ |
1827 | 1826 | ||
1828 | /*****************************************************************************/ | 1827 | /*****************************************************************************/ |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index bd70e818212a..239c75217b12 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1009,7 +1009,6 @@ static void streamer_rx(struct net_device *dev) | |||
1009 | /* send up to the protocol */ | 1009 | /* send up to the protocol */ |
1010 | netif_rx(skb); | 1010 | netif_rx(skb); |
1011 | } | 1011 | } |
1012 | dev->last_rx = jiffies; | ||
1013 | streamer_priv->streamer_stats.rx_packets++; | 1012 | streamer_priv->streamer_stats.rx_packets++; |
1014 | streamer_priv->streamer_stats.rx_bytes += length; | 1013 | streamer_priv->streamer_stats.rx_bytes += length; |
1015 | } /* if skb == null */ | 1014 | } /* if skb == null */ |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index f78bc5d40708..ecb5c7c96910 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -862,7 +862,6 @@ static void olympic_rx(struct net_device *dev) | |||
862 | skb->protocol = tr_type_trans(skb,dev); | 862 | skb->protocol = tr_type_trans(skb,dev); |
863 | netif_rx(skb) ; | 863 | netif_rx(skb) ; |
864 | } | 864 | } |
865 | dev->last_rx = jiffies ; | ||
866 | olympic_priv->olympic_stats.rx_packets++ ; | 865 | olympic_priv->olympic_stats.rx_packets++ ; |
867 | olympic_priv->olympic_stats.rx_bytes += length ; | 866 | olympic_priv->olympic_stats.rx_bytes += length ; |
868 | } /* if skb == null */ | 867 | } /* if skb == null */ |
@@ -1441,7 +1440,6 @@ static void olympic_arb_cmd(struct net_device *dev) | |||
1441 | dev->name, mac_hdr->saddr); | 1440 | dev->name, mac_hdr->saddr); |
1442 | } | 1441 | } |
1443 | netif_rx(mac_frame); | 1442 | netif_rx(mac_frame); |
1444 | dev->last_rx = jiffies; | ||
1445 | 1443 | ||
1446 | drop_frame: | 1444 | drop_frame: |
1447 | /* Now tell the card we have dealt with the received frame */ | 1445 | /* Now tell the card we have dealt with the received frame */ |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index ed50d288e494..a011666342ff 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -3910,7 +3910,6 @@ static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size, | |||
3910 | /* Kick the packet on up. */ | 3910 | /* Kick the packet on up. */ |
3911 | skb->protocol = tr_type_trans(skb, dev); | 3911 | skb->protocol = tr_type_trans(skb, dev); |
3912 | netif_rx(skb); | 3912 | netif_rx(skb); |
3913 | dev->last_rx = jiffies; | ||
3914 | err = 0; | 3913 | err = 0; |
3915 | } | 3914 | } |
3916 | 3915 | ||
@@ -4496,7 +4495,6 @@ static int smctr_rx_frame(struct net_device *dev) | |||
4496 | /* Kick the packet on up. */ | 4495 | /* Kick the packet on up. */ |
4497 | skb->protocol = tr_type_trans(skb, dev); | 4496 | skb->protocol = tr_type_trans(skb, dev); |
4498 | netif_rx(skb); | 4497 | netif_rx(skb); |
4499 | dev->last_rx = jiffies; | ||
4500 | } else { | 4498 | } else { |
4501 | } | 4499 | } |
4502 | } | 4500 | } |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index d07c4523c847..b408397c83e7 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -2186,7 +2186,6 @@ static void tms380tr_rcv_status_irq(struct net_device *dev) | |||
2186 | skb_trim(skb,Length); | 2186 | skb_trim(skb,Length); |
2187 | skb->protocol = tr_type_trans(skb,dev); | 2187 | skb->protocol = tr_type_trans(skb,dev); |
2188 | netif_rx(skb); | 2188 | netif_rx(skb); |
2189 | dev->last_rx = jiffies; | ||
2190 | } | 2189 | } |
2191 | } | 2190 | } |
2192 | else /* Invalid frame */ | 2191 | else /* Invalid frame */ |