drivers: 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.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Neil Horman <nhorman@txudriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 84edc8b84c621a7155fd6cfef32e6cfe710b15c0..cbaf420c36c531d4c09d612b62bca003dd86896e 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -663,8 +663,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
        if (netif_queue_stopped(net))
                netif_wake_queue(net);
 
-       net->last_rx = jiffies;
-
        return 0;
 }
 

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 3a62c4c2d4199de4402d9bbd0f308f2ece9e6b1a..a4e9dcb6d4a9adfb3f83296f9b21176744edc16e 100644 (file)
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1301,7 +1301,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
 
        hpsb_iso_recv_release_packets(iso, i);
 
-       dev->last_rx = jiffies;
 }
 
 /******************************************

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 0cfbb6d2f762b5699c4edef953ab5757196dae5c..8c5d2842fbb5986c46774c19937e158d09497027 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -530,7 +530,6 @@ static void c2_rx_interrupt(struct net_device *netdev)
 
                netif_rx(skb);
 
-               netdev->last_rx = jiffies;
                netdev->stats.rx_packets++;
                netdev->stats.rx_bytes += buflen;
        }

diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 4a84d02ece0637fcbd3da54aed4131e6fbb45c4b..97d4c2a33ed623e054204c57db1fca19fada2a9b 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2741,7 +2741,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
                                }
 
 skip_rx_indicate0:
-                               nesvnic->netdev->last_rx = jiffies;
+                               ;
                                /* nesvnic->netstats.rx_packets++; */
                                /* nesvnic->netstats.rx_bytes += rx_pkt_size; */
                        }

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 181b1f32325f3a009ce13af55c7aafa66dd67177..986f07fb3ec42ddbf2987d6974f21adf764e36d6 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -663,7 +663,6 @@ copied:
        skb_reset_mac_header(skb);
        skb_pull(skb, IPOIB_ENCAP_LEN);
 
-       dev->last_rx = jiffies;
        ++dev->stats.rx_packets;
        dev->stats.rx_bytes += skb->len;
 

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index e7e5adf84e840e3f13aa54dc1c1036f6d4a81846..c9dcb2064f20b632c8999daad7a4d65720ca85c3 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -277,7 +277,6 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
        skb_reset_mac_header(skb);
        skb_pull(skb, IPOIB_ENCAP_LEN);
 
-       dev->last_rx = jiffies;
        ++dev->stats.rx_packets;
        dev->stats.rx_bytes += skb->len;
 

diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 212da9af1ce78daae9ed70052efb54ed89ac81bb..16f0abda1423bf43e0604a5484e261d52651efa6 100644 (file)
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -240,7 +240,6 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
                (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
                skb_end_pointer(skb), skb->len);
 
-       xpnet_device->last_rx = jiffies;
        xpnet_device->stats.rx_packets++;
        xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
 

diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 4f702d52606a992a861303a5dbb786d390907d63..2a7b7745cc55b54cefada690b0ea47865b54b6b9 100644 (file)
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -467,7 +467,6 @@ ks8695_rx_irq(int irq, void *dev_id)
                        netif_rx(skb);
 
                        /* Record stats */
-                       ndev->last_rx = jiffies;
                        ndev->stats.rx_packets++;
                        ndev->stats.rx_bytes += pktlen;
                        goto rx_finished;

diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 3a0948f02b46a27bf6822ff74b49bd012eee6cd2..25e2627eb1183502f7efd571c5a3b3c86392eef4 100644 (file)
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -777,7 +777,6 @@ static void netdev_rx(struct net_device *dev)
 
                rxbd = &ether->rdesc->desclist[ether->cur_rx];
 
-               dev->last_rx = jiffies;
        } while (1);
 }
 

diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index bf7cc83e9836da98b025ffc47fc2df2dadc8613d..e46bf9238692c6948e5cc6e8270377b82d753496 100644 (file)
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -1740,7 +1740,6 @@ rrs_checked:
                } else
                        netif_receive_skb(skb);
 
-               netdev->last_rx = jiffies;
                (*work_done)++;
                count++;
        }

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index e19fe1dcd1446770f3e90e511cfb5e4e83d4876d..bac85f950394d22bc17d25e474a327349b7acbd8 100644 (file)
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -775,8 +775,6 @@ static void be_rx_compl_process(struct be_adapter *adapter,
                netif_receive_skb(skb);
        }
 
-       adapter->netdev->last_rx = jiffies;
-
        return;
 }
 

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index e1a4f8214239059ce079480bd4b2a5f08bd167c2..1d29082d94ac32886472963b4e48c4283ed1bf80 100644 (file)
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -357,7 +357,6 @@ void can_restart(unsigned long data)
 
        netif_rx(skb);
 
-       dev->last_rx = jiffies;
        stats->rx_packets++;
        stats->rx_bytes += cf->can_dlc;
 

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 9ce3ddac4e9b219e71248e56c445fa391c5dae92..fd7fa716a6ca712a42eac8462a629082a9090a9c 100644 (file)
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -340,7 +340,6 @@ static void sja1000_rx(struct net_device *dev)
 
        netif_rx(skb);
 
-       dev->last_rx = jiffies;
        stats->rx_packets++;
        stats->rx_bytes += dlc;
 }
@@ -455,7 +454,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
        netif_rx(skb);
 
-       dev->last_rx = jiffies;
        stats->rx_packets++;
        stats->rx_bytes += cf->can_dlc;
 

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 5e6652b8728d949affedd446d6fb65f67773dff9..d465eaa796c464246918ee5fc62e18a261845591 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1920,7 +1920,6 @@ static int emac_net_rx_cb(struct emac_priv *priv,
        skb_put(p_skb, net_pkt_list->pkt_length);
        EMAC_CACHE_INVALIDATE((unsigned long)p_skb->data, p_skb->len);
        p_skb->protocol = eth_type_trans(p_skb, priv->ndev);
-       p_skb->dev->last_rx = jiffies;
        netif_receive_skb(p_skb);
        priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length;
        priv->net_dev_stats.rx_packets++;

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b871aefed9c6a8ac050ca79f6c3204ac25ed34df..b7311bc00258569e210949fcf2c17ceaaa62b46b 100644 (file)
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -404,7 +404,6 @@ static int ethoc_rx(struct net_device *dev, int limit)
                                void *src = priv->membase + bd.addr;
                                memcpy_fromio(skb_put(skb, size), src, size);
                                skb->protocol = eth_type_trans(skb, dev);
-                               dev->last_rx = jiffies;
                                priv->stats.rx_packets++;
                                priv->stats.rx_bytes += size;
                                netif_receive_skb(skb);

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index dadb78229ad549b15205bd046f2b289f3c298e63..91024a3cdad3266dbb32aca58ee1fb5688863209 100644 (file)
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -96,8 +96,6 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
                                         E1000_RXD_SPC_VLAN_MASK);
        else
                netif_receive_skb(skb);
-
-       netdev->last_rx = jiffies;
 }
 
 static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
@@ -342,8 +340,6 @@ send_up:
                igbvf_receive_skb(adapter, netdev, skb, staterr,
                                  rx_desc->wb.upper.vlan);
 
-               netdev->last_rx = jiffies;
-
 next_desc:
                rx_desc->wb.upper.status_error = 0;
 

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index c2667855a005a8099fc129cf264699e9b627eff4..ccdd196f5297952f993291819e1d65b5526402b0 100644 (file)
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1047,7 +1047,6 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
                /* Update counters */
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += (pktlength - 4);
-               dev->last_rx = jiffies;
        }
 
        /* Return total received packets */

diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 514311d67b36255d582a0add8d89fbf6b6120721..b4909a2dec66bfb4e9835cf0223654cafcebc347 100644 (file)
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -817,7 +817,6 @@ static void smsc9420_rx_handoff(struct smsc9420_pdata *pd, const int index,
        skb->protocol = eth_type_trans(skb, dev);
 
        netif_receive_skb(skb);
-       dev->last_rx = jiffies;
 }
 
 static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 41dccba50c463d94feb8624d30f252743ecec60c..b378037a29b560cdac222d6e47cf2b69e455220a 100644 (file)
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -588,8 +588,6 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
        if (first_dtr)
                vxge_hw_ring_rxd_post_post_wmb(ringh, first_dtr);
 
-       dev->last_rx = jiffies;
-
        vxge_debug_entryexit(VXGE_TRACE,
                                "%s:%d  Exiting...",
                                __func__, __LINE__);

diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index f79cee82601b397242c633d93be959968518958e..103f3c9e7f58afd00299a155dca245c12ddd5b26 100644 (file)
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -590,7 +590,6 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
                       chanstat);
        }
 
-       dev->stats.last_rx = jiffies;
        memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
        ieee80211_rx_irqsafe(dev->wl->hw, skb);
 

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 7e05b40ae36b50b6eb66d9512ae3a49ba2d36a47..dc22782633a5b4ac58eb04c285055ccaa6f9c867 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -587,7 +587,6 @@ static void xemaclite_rx_handler(struct net_device *dev)
 
        dev->stats.rx_packets++;
        dev->stats.rx_bytes += len;
-       dev->last_rx = jiffies;
 
        netif_rx(skb);          /* Send the packet upstream */
 }

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 38b5079f15992710f6a346629f2d30a0c5f25493..c5b83874500ccb9b9154195f405e7c57178daff3 100644 (file)
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -164,7 +164,6 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
                priv->stats.rx_packets++;
                priv->stats.rx_bytes += skblen;
                netif_rx_ni(skb);
-               dev->last_rx = jiffies;
                if (len > 0) {
                        skb_pull(pskb, header->length);
                        if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index bb1183a2ed66f43e93d8b39a4f21e00422616533..271c4a82e84b6bedceb099c188670fa5cd23f4b1 100644 (file)
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -676,7 +676,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
                 * we must use netif_rx_ni() instead of netif_rx()
                 */
                netif_rx_ni(skb);
-               dev->last_rx = jiffies;
                skb_pull(pskb, header->next);
                skb_put(pskb, NETIUCV_HDRLEN);
        }

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 94b161121c2625581b90c1e088066d209ca341eb..f4f3ca1393b2cfff609b9797b85f1769fa64e21a 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -449,7 +449,6 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
                        QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
                        continue;
                }
-               card->dev->last_rx = jiffies;
                card->stats.rx_packets++;
                card->stats.rx_bytes += len;
        }

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 115b4a0dae6ea0049f0ca555bc60ca0c3c0e40d5..073b6d3549150eb4e91b5dc5ed2f3f12342bc758 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1987,7 +1987,6 @@ static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
                        continue;
                }
 
-               card->dev->last_rx = jiffies;
                card->stats.rx_packets++;
                card->stats.rx_bytes += len;
        }