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>

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)
 
                         netif_rx(skb2) ;                
                  } /* if multiple buffers */
-                dev->last_rx = jiffies ;        
         } /* while packet to do */
 
         /* Clear the updComplete interrupt */
@@ -1571,7 +1570,6 @@ static void xl_arb_cmd(struct net_device *dev)
                  * anyway.
                  */
 
-                dev->last_rx = jiffies ; 
                 /* Acknowledge interrupt, this tells nic we are done with the arb */
                 writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
 
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)
                 skb->ip_summed = CHECKSUM_COMPLETE;
         }
         netif_rx(skb);
-        dev->last_rx = jiffies;
 }                               /*tr_rx */
 
 /*****************************************************************************/
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)
                                         /* send up to the protocol */
                                         netif_rx(skb);
                                 }
-                                dev->last_rx = jiffies;
                                 streamer_priv->streamer_stats.rx_packets++;
                                 streamer_priv->streamer_stats.rx_bytes += length;
                         }       /* 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)
                                                 skb->protocol = tr_type_trans(skb,dev);
                                                 netif_rx(skb) ; 
                                         } 
-                                        dev->last_rx = jiffies ; 
                                         olympic_priv->olympic_stats.rx_packets++ ; 
                                         olympic_priv->olympic_stats.rx_bytes += length ; 
                                 } /* if skb == null */
@@ -1441,7 +1440,6 @@ static void olympic_arb_cmd(struct net_device *dev)
                                dev->name, mac_hdr->saddr);
                 }
                 netif_rx(mac_frame);
-                dev->last_rx = jiffies;
 
 drop_frame:
                 /* 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,
                 /* Kick the packet on up. */
                 skb->protocol = tr_type_trans(skb, dev);
                 netif_rx(skb);
-                dev->last_rx = jiffies;
                 err = 0;
         }
 
@@ -4496,7 +4495,6 @@ static int smctr_rx_frame(struct net_device *dev)
                                         /* Kick the packet on up. */
                                         skb->protocol = tr_type_trans(skb, dev);
                                         netif_rx(skb);
-                                        dev->last_rx = jiffies;
                                 } else {
                                 }
                         }
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)
                                 skb_trim(skb,Length);
                                 skb->protocol = tr_type_trans(skb,dev);
                                 netif_rx(skb);
-                                dev->last_rx = jiffies;
                         }
                 }
                 else    /* Invalid frame */