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>

12 files changed, 0 insertions, 20 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index d7388d2aee97..c8dc6568cec9 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -3366,7 +3366,6 @@ badrx:
                                 skb->protocol = htons(ETH_P_802_2);
                         } else
                                 skb->protocol = eth_type_trans(skb,dev);
-                        skb->dev->last_rx = jiffies;
                         skb->ip_summed = CHECKSUM_NONE;
 
                         netif_rx( skb );
@@ -3596,7 +3595,6 @@ badmic:
 
                 skb->ip_summed = CHECKSUM_NONE;
                 skb->protocol = eth_type_trans(skb, ai->dev);
-                skb->dev->last_rx = jiffies;
                 netif_rx(skb);
         }
 badrx:
@@ -3690,7 +3688,6 @@ void mpi_receive_802_11 (struct airo_info *ai)
         skb->pkt_type = PACKET_OTHERHOST;
         skb->dev = ai->wifidev;
         skb->protocol = htons(ETH_P_802_2);
-        skb->dev->last_rx = jiffies;
         skb->ip_summed = CHECKSUM_NONE;
         netif_rx( skb );
 badrx:
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index b608643d5fcc..bfca15da6f0f 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1529,7 +1529,6 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                         printk(KERN_WARNING "arlan kernel pkt type trans %x \n", skb->protocol);
                                 }
                         netif_rx(skb);
-                        dev->last_rx = jiffies;
                         dev->stats.rx_packets++;
                         dev->stats.rx_bytes += pkt_len;
                 }
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 6e20552c1881..d16931589f81 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -919,7 +919,6 @@ static void fast_rx_path(struct atmel_private *priv,
         else
                 memcpy(&skbp[6], header->addr2, 6); /* source address */
 
-        priv->dev->last_rx = jiffies;
         skb->protocol = eth_type_trans(skb, priv->dev);
         skb->ip_summed = CHECKSUM_NONE;
         netif_rx(skb);
@@ -1026,7 +1025,6 @@ static void frag_rx_path(struct atmel_private *priv,
                                 memcpy(skb_put(skb, priv->frag_len + 12),
                                        priv->rx_buf,
                                        priv->frag_len + 12);
-                                priv->dev->last_rx = jiffies;
                                 skb->protocol = eth_type_trans(skb, priv->dev);
                                 skb->ip_summed = CHECKSUM_NONE;
                                 netif_rx(skb);
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index bbb8ec6683d7..5f64461aa54e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -67,7 +67,6 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
 
         iface = netdev_priv(dev);
         local = iface->local;
-        dev->last_rx = jiffies;
 
         if (dev->type == ARPHRD_IEEE80211_PRISM) {
                 if (local->monitor_type == PRISM2_MONITOR_PRISM) {
@@ -883,8 +882,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                 from_assoc_ap = 1;
         }
 
-        dev->last_rx = jiffies;
-
         if ((local->iw_mode == IW_MODE_MASTER ||
              local->iw_mode == IW_MODE_REPEAT) &&
             !from_assoc_ap) {
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index be80c0093b79..24caec6caf1f 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -1307,7 +1307,6 @@ static int netwave_rx(struct net_device *dev)
         /* Queue packet for network layer */
         netif_rx(skb);
 
-        dev->last_rx = jiffies;
         priv->stats.rx_packets++;
         priv->stats.rx_bytes += rcvLen;
 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 5a39166e2a0f..b657a916b1d7 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1289,7 +1289,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
         skb->pkt_type = PACKET_OTHERHOST;
         skb->protocol = __constant_htons(ETH_P_802_2);
         
-        dev->last_rx = jiffies;
         stats->rx_packets++;
         stats->rx_bytes += skb->len;
 
@@ -1538,7 +1537,6 @@ static void orinoco_rx(struct net_device *dev,
         else
                 memcpy(hdr->h_source, desc->addr2, ETH_ALEN);
 
-        dev->last_rx = jiffies;
         skb->protocol = eth_type_trans(skb, dev);
         skb->ip_summed = CHECKSUM_NONE;
         if (fc & IEEE80211_FCTL_TODS)
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index bf0b9299b5df..81b71f07f5ad 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2284,7 +2284,6 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, unsigned i
 
     skb->protocol = eth_type_trans(skb,dev);
     netif_rx(skb);
-    dev->last_rx = jiffies;
     local->stats.rx_packets++;
     local->stats.rx_bytes += total_len;
 
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 417e9e675fac..cf0d070ced13 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1997,7 +1997,6 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header * header,
 #ifdef EXT_COUNTERS
                 strip_info->rx_bytes += packetlen;
 #endif
-                skb->dev->last_rx = jiffies;
                 netif_rx(skb);
         }
 }
@@ -2490,7 +2489,6 @@ static void strip_dev_setup(struct net_device *dev)
          */
 
         dev->trans_start = 0;
-        dev->last_rx = 0;
         dev->tx_queue_len = 30; /* Drop after 30 frames queued */
 
         dev->flags = 0;
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 6fa3d792ae27..1ac37e86b9bd 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2528,7 +2528,6 @@ wv_packet_read(struct net_device * dev, u16 buf_off, int sksize)
         netif_rx(skb);
 
         /* Keep statistics up to date */
-        dev->last_rx = jiffies;
         lp->stats.rx_packets++;
         lp->stats.rx_bytes += sksize;
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 0a3bacc20d96..de717f8ffd61 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -2878,7 +2878,6 @@ wv_packet_read(struct net_device *		dev,
   netif_rx(skb);
 
   /* Keep stats up to date */
-  dev->last_rx = jiffies;
   lp->stats.rx_packets++;
   lp->stats.rx_bytes += sksize;
 
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 8b96f50d9c6f..c99a1b6b948f 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1013,7 +1013,6 @@ static inline void wl3501_md_ind_interrupt(struct net_device *dev,
                 wl3501_receive(this, skb->data, pkt_len);
                 skb_put(skb, pkt_len);
                 skb->protocol   = eth_type_trans(skb, dev);
-                dev->last_rx    = jiffies;
                 this->stats.rx_packets++;
                 this->stats.rx_bytes += skb->len;
                 netif_rx(skb);
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index b16ec6e5f0e3..bf744c1f5b23 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -328,7 +328,6 @@ static void zd1201_usbrx(struct urb *urb)
                         memcpy(skb_put(skb, 2), &data[datalen-24], 2);
                         memcpy(skb_put(skb, len), data, len);
                         skb->protocol = eth_type_trans(skb, zd->dev);
-                        skb->dev->last_rx = jiffies;
                         zd->stats.rx_packets++;
                         zd->stats.rx_bytes += skb->len;
                         netif_rx(skb);
@@ -385,7 +384,6 @@ static void zd1201_usbrx(struct urb *urb)
                         memcpy(skb_put(skb, len), data+8, len);
                 }
                 skb->protocol = eth_type_trans(skb, zd->dev);
-                skb->dev->last_rx = jiffies;
                 zd->stats.rx_packets++;
                 zd->stats.rx_bytes += skb->len;
                 netif_rx(skb);