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>

15 files changed, 0 insertions, 26 deletions

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 7f97f8d08c39..d80b72e22dea 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -754,7 +754,6 @@ static int cosa_net_rx_done(struct channel_data *chan)
         chan->netdev->stats.rx_bytes += chan->cosa->rxsize;
         netif_rx(chan->rx_skb);
         chan->rx_skb = NULL;
-        chan->netdev->last_rx = jiffies;
         return 0;
 }
 
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 5a7303dc0965..aeea321e4a9d 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -843,7 +843,6 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd)
 
         skb_reset_mac_header(skb);
         netif_rx(skb);
-        dev->last_rx = jiffies;         /* timestamp */
 }
 
 /* Connect interrupt handler. */
@@ -1494,7 +1493,6 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event)
 
         skb->protocol = x25_type_trans(skb, dev);
         netif_rx(skb);
-        dev->last_rx = jiffies;         /* timestamp */
 }
 
 /* Convert line speed in bps to a number used by cyclom 2x code. */
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index b14242768fad..5d13832978eb 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -181,7 +181,6 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
                 dlp->stats.rx_bytes += skb->len;
                 netif_rx(skb);
                 dlp->stats.rx_packets++;
-                dev->last_rx = jiffies;
         }
         else
                 dev_kfree_skb(skb);
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 7d16ca3cb93c..888025db2f02 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -659,7 +659,6 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
                 skb_put(skb, pkt_len);
                 if (netif_running(dev))
                         skb->protocol = hdlc_type_trans(skb, dev);
-                skb->dev->last_rx = jiffies;
                 netif_rx(skb);
         } else {
                 if (skb->data[pkt_len] & FrameRdo)
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 9557ad078ab8..48a2c9d28950 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -896,7 +896,6 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
         fst_process_rx_status(rx_status, port_to_dev(port)->name);
         if (rx_status == NET_RX_DROP)
                 dev->stats.rx_dropped++;
-        dev->last_rx = jiffies;
 }
 
 /*
@@ -1322,7 +1321,6 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
                 fst_process_rx_status(rx_status, port_to_dev(port)->name);
                 if (rx_status == NET_RX_DROP)
                         dev->stats.rx_dropped++;
-                dev->last_rx = jiffies;
         } else {
                 card->dma_skb_rx = skb;
                 card->dma_port_rx = port;
diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index 591fb45a7c68..434583a94b32 100644
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -328,7 +328,6 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, u1
 #endif
         dev->stats.rx_packets++;
         dev->stats.rx_bytes += skb->len;
-        dev->last_rx = jiffies;
         skb->protocol = hdlc_type_trans(skb, dev);
         netif_rx(skb);
 }
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index e299313f828a..af54f0cf1b35 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -66,7 +66,6 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)
          *      it right now.
          */
         netif_rx(skb);
-        c->netdevice->last_rx = jiffies;
 }
 
 /*
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 24fd613466b7..5b61b3eef45f 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -143,7 +143,6 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
         *ptr = 0x00;
 
         skb->protocol = x25_type_trans(skb, dev);
-        skb->dev->last_rx = jiffies;
         return netif_rx(skb);
 }
 
@@ -235,7 +234,6 @@ static void lapbeth_connected(struct net_device *dev, int reason)
         *ptr = 0x01;
 
         skb->protocol = x25_type_trans(skb, dev);
-        skb->dev->last_rx = jiffies;
         netif_rx(skb);
 }
 
@@ -253,7 +251,6 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
         *ptr = 0x02;
 
         skb->protocol = x25_type_trans(skb, dev);
-        skb->dev->last_rx = jiffies;
         netif_rx(skb);
 }
 
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index d7bb63e616b5..feac3b99f8fe 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1594,7 +1594,6 @@ static int lmc_rx(struct net_device *dev)
             goto skip_packet;
         }
         
-        dev->last_rx = jiffies;
         sc->lmc_device->stats.rx_packets++;
         sc->lmc_device->stats.rx_bytes += len;
 
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index be9877ff551e..94b4c208b013 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -142,7 +142,6 @@ void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
     case LMC_PPP:
     case LMC_NET:
     default:
-        skb->dev->last_rx = jiffies;
         netif_rx(skb);
         break;
     case LMC_RAW:
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 )
 #ifdef CONFIG_SBNI_MULTILINE
         skb->protocol = eth_type_trans( skb, nl->master );
         netif_rx( skb );
-        dev->last_rx = jiffies;
         ++((struct net_local *) nl->master->priv)->stats.rx_packets;
         ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos;
 #else
         skb->protocol = eth_type_trans( skb, dev );
         netif_rx( skb );
-        dev->last_rx = jiffies;
         ++nl->stats.rx_packets;
         nl->stats.rx_bytes += nl->inppos;
 #endif
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index c0235844a4d5..0941a26f6e3f 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -68,7 +68,6 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb)
         skb_reset_mac_header(skb);
         skb->dev = c->netdevice;
         netif_rx(skb);
-        c->netdevice->last_rx = jiffies;
 }
 
 /*
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 6e92f7b44b1a..58ae8a2223af 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -284,7 +284,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb)
                                         printk(KERN_DEBUG "Yow an IP frame.\n");
                                 skb->protocol=htons(ETH_P_IP);
                                 netif_rx(skb);
-                                dev->last_rx = jiffies;
                                 goto done;
                         }
                         break;
@@ -294,7 +293,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb)
                         if (sp->lcp.state == LCP_STATE_OPENED) {
                                 skb->protocol=htons(ETH_P_IPX);
                                 netif_rx(skb);
-                                dev->last_rx = jiffies;
                                 goto done;
                         }
                         break;
@@ -321,14 +319,12 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb)
                 case ETH_P_IP:
                         skb->protocol=htons(ETH_P_IP);
                         netif_rx(skb);
-                        dev->last_rx = jiffies;
                         goto done;
 #endif
 #ifdef CONFIG_IPX
                 case ETH_P_IPX:
                         skb->protocol=htons(ETH_P_IPX);
                         netif_rx(skb);
-                        dev->last_rx = jiffies;
                         goto done;
 #endif
                 }
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index a8a5ca0ee6c2..88459490ecd2 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -220,7 +220,6 @@ static inline void wanxl_rx_intr(card_t *card)
 #endif
                                 dev->stats.rx_packets++;
                                 dev->stats.rx_bytes += skb->len;
-                                dev->last_rx = jiffies;
                                 skb->protocol = hdlc_type_trans(skb, dev);
                                 netif_rx(skb);
                                 skb = NULL;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 2a6c7a60756f..3b7bdfd25148 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -211,7 +211,6 @@ static void x25_asy_bump(struct x25_asy *sl)
                 printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);
         } else {
                 netif_rx(skb);
-                sl->dev->last_rx = jiffies;
                 sl->stats.rx_packets++;
         }
 }
@@ -361,7 +360,6 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)
 {
-        skb->dev->last_rx = jiffies;
         return netif_rx(skb);
 }
 
@@ -413,7 +411,6 @@ static void x25_asy_connected(struct net_device *dev, int reason)
 
         skb->protocol = x25_type_trans(skb, sl->dev);
         netif_rx(skb);
-        sl->dev->last_rx = jiffies;
 }
 
 static void x25_asy_disconnected(struct net_device *dev, int reason)
@@ -433,7 +430,6 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
 
         skb->protocol = x25_type_trans(skb, sl->dev);
         netif_rx(skb);
-        sl->dev->last_rx = jiffies;
 }
 
 static struct lapb_register_struct x25_asy_callbacks = {