mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
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>
This commit is contained in:
parent
6ce9e7b5fe
commit
451f144398
25 changed files with 1 additions and 32 deletions
|
@ -663,8 +663,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
|
||||||
if (netif_queue_stopped(net))
|
if (netif_queue_stopped(net))
|
||||||
netif_wake_queue(net);
|
netif_wake_queue(net);
|
||||||
|
|
||||||
net->last_rx = jiffies;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1301,7 +1301,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
|
||||||
|
|
||||||
hpsb_iso_recv_release_packets(iso, i);
|
hpsb_iso_recv_release_packets(iso, i);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
|
|
|
@ -530,7 +530,6 @@ static void c2_rx_interrupt(struct net_device *netdev)
|
||||||
|
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
||||||
netdev->last_rx = jiffies;
|
|
||||||
netdev->stats.rx_packets++;
|
netdev->stats.rx_packets++;
|
||||||
netdev->stats.rx_bytes += buflen;
|
netdev->stats.rx_bytes += buflen;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2741,7 +2741,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
|
||||||
}
|
}
|
||||||
|
|
||||||
skip_rx_indicate0:
|
skip_rx_indicate0:
|
||||||
nesvnic->netdev->last_rx = jiffies;
|
;
|
||||||
/* nesvnic->netstats.rx_packets++; */
|
/* nesvnic->netstats.rx_packets++; */
|
||||||
/* nesvnic->netstats.rx_bytes += rx_pkt_size; */
|
/* nesvnic->netstats.rx_bytes += rx_pkt_size; */
|
||||||
}
|
}
|
||||||
|
|
|
@ -663,7 +663,6 @@ copied:
|
||||||
skb_reset_mac_header(skb);
|
skb_reset_mac_header(skb);
|
||||||
skb_pull(skb, IPOIB_ENCAP_LEN);
|
skb_pull(skb, IPOIB_ENCAP_LEN);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
++dev->stats.rx_packets;
|
++dev->stats.rx_packets;
|
||||||
dev->stats.rx_bytes += skb->len;
|
dev->stats.rx_bytes += skb->len;
|
||||||
|
|
||||||
|
|
|
@ -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_reset_mac_header(skb);
|
||||||
skb_pull(skb, IPOIB_ENCAP_LEN);
|
skb_pull(skb, IPOIB_ENCAP_LEN);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
++dev->stats.rx_packets;
|
++dev->stats.rx_packets;
|
||||||
dev->stats.rx_bytes += skb->len;
|
dev->stats.rx_bytes += skb->len;
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,6 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
|
||||||
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
|
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
|
||||||
skb_end_pointer(skb), skb->len);
|
skb_end_pointer(skb), skb->len);
|
||||||
|
|
||||||
xpnet_device->last_rx = jiffies;
|
|
||||||
xpnet_device->stats.rx_packets++;
|
xpnet_device->stats.rx_packets++;
|
||||||
xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
|
xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
|
||||||
|
|
||||||
|
|
|
@ -467,7 +467,6 @@ ks8695_rx_irq(int irq, void *dev_id)
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
||||||
/* Record stats */
|
/* Record stats */
|
||||||
ndev->last_rx = jiffies;
|
|
||||||
ndev->stats.rx_packets++;
|
ndev->stats.rx_packets++;
|
||||||
ndev->stats.rx_bytes += pktlen;
|
ndev->stats.rx_bytes += pktlen;
|
||||||
goto rx_finished;
|
goto rx_finished;
|
||||||
|
|
|
@ -777,7 +777,6 @@ static void netdev_rx(struct net_device *dev)
|
||||||
|
|
||||||
rxbd = ðer->rdesc->desclist[ether->cur_rx];
|
rxbd = ðer->rdesc->desclist[ether->cur_rx];
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
} while (1);
|
} while (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1740,7 +1740,6 @@ rrs_checked:
|
||||||
} else
|
} else
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
|
|
||||||
netdev->last_rx = jiffies;
|
|
||||||
(*work_done)++;
|
(*work_done)++;
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -775,8 +775,6 @@ static void be_rx_compl_process(struct be_adapter *adapter,
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
adapter->netdev->last_rx = jiffies;
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -357,7 +357,6 @@ void can_restart(unsigned long data)
|
||||||
|
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
stats->rx_packets++;
|
stats->rx_packets++;
|
||||||
stats->rx_bytes += cf->can_dlc;
|
stats->rx_bytes += cf->can_dlc;
|
||||||
|
|
||||||
|
|
|
@ -340,7 +340,6 @@ static void sja1000_rx(struct net_device *dev)
|
||||||
|
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
stats->rx_packets++;
|
stats->rx_packets++;
|
||||||
stats->rx_bytes += dlc;
|
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);
|
netif_rx(skb);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
stats->rx_packets++;
|
stats->rx_packets++;
|
||||||
stats->rx_bytes += cf->can_dlc;
|
stats->rx_bytes += cf->can_dlc;
|
||||||
|
|
||||||
|
|
|
@ -1920,7 +1920,6 @@ static int emac_net_rx_cb(struct emac_priv *priv,
|
||||||
skb_put(p_skb, net_pkt_list->pkt_length);
|
skb_put(p_skb, net_pkt_list->pkt_length);
|
||||||
EMAC_CACHE_INVALIDATE((unsigned long)p_skb->data, p_skb->len);
|
EMAC_CACHE_INVALIDATE((unsigned long)p_skb->data, p_skb->len);
|
||||||
p_skb->protocol = eth_type_trans(p_skb, priv->ndev);
|
p_skb->protocol = eth_type_trans(p_skb, priv->ndev);
|
||||||
p_skb->dev->last_rx = jiffies;
|
|
||||||
netif_receive_skb(p_skb);
|
netif_receive_skb(p_skb);
|
||||||
priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length;
|
priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length;
|
||||||
priv->net_dev_stats.rx_packets++;
|
priv->net_dev_stats.rx_packets++;
|
||||||
|
|
|
@ -404,7 +404,6 @@ static int ethoc_rx(struct net_device *dev, int limit)
|
||||||
void *src = priv->membase + bd.addr;
|
void *src = priv->membase + bd.addr;
|
||||||
memcpy_fromio(skb_put(skb, size), src, size);
|
memcpy_fromio(skb_put(skb, size), src, size);
|
||||||
skb->protocol = eth_type_trans(skb, dev);
|
skb->protocol = eth_type_trans(skb, dev);
|
||||||
dev->last_rx = jiffies;
|
|
||||||
priv->stats.rx_packets++;
|
priv->stats.rx_packets++;
|
||||||
priv->stats.rx_bytes += size;
|
priv->stats.rx_bytes += size;
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
|
|
|
@ -96,8 +96,6 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
|
||||||
E1000_RXD_SPC_VLAN_MASK);
|
E1000_RXD_SPC_VLAN_MASK);
|
||||||
else
|
else
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
|
|
||||||
netdev->last_rx = jiffies;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
|
static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
|
||||||
|
@ -342,8 +340,6 @@ send_up:
|
||||||
igbvf_receive_skb(adapter, netdev, skb, staterr,
|
igbvf_receive_skb(adapter, netdev, skb, staterr,
|
||||||
rx_desc->wb.upper.vlan);
|
rx_desc->wb.upper.vlan);
|
||||||
|
|
||||||
netdev->last_rx = jiffies;
|
|
||||||
|
|
||||||
next_desc:
|
next_desc:
|
||||||
rx_desc->wb.upper.status_error = 0;
|
rx_desc->wb.upper.status_error = 0;
|
||||||
|
|
||||||
|
|
|
@ -1047,7 +1047,6 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
|
||||||
/* Update counters */
|
/* Update counters */
|
||||||
dev->stats.rx_packets++;
|
dev->stats.rx_packets++;
|
||||||
dev->stats.rx_bytes += (pktlength - 4);
|
dev->stats.rx_bytes += (pktlength - 4);
|
||||||
dev->last_rx = jiffies;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return total received packets */
|
/* Return total received packets */
|
||||||
|
|
|
@ -817,7 +817,6 @@ static void smsc9420_rx_handoff(struct smsc9420_pdata *pd, const int index,
|
||||||
skb->protocol = eth_type_trans(skb, dev);
|
skb->protocol = eth_type_trans(skb, dev);
|
||||||
|
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
dev->last_rx = jiffies;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)
|
static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)
|
||||||
|
|
|
@ -588,8 +588,6 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
|
||||||
if (first_dtr)
|
if (first_dtr)
|
||||||
vxge_hw_ring_rxd_post_post_wmb(ringh, first_dtr);
|
vxge_hw_ring_rxd_post_post_wmb(ringh, first_dtr);
|
||||||
|
|
||||||
dev->last_rx = jiffies;
|
|
||||||
|
|
||||||
vxge_debug_entryexit(VXGE_TRACE,
|
vxge_debug_entryexit(VXGE_TRACE,
|
||||||
"%s:%d Exiting...",
|
"%s:%d Exiting...",
|
||||||
__func__, __LINE__);
|
__func__, __LINE__);
|
||||||
|
|
|
@ -590,7 +590,6 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
|
||||||
chanstat);
|
chanstat);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->stats.last_rx = jiffies;
|
|
||||||
memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
|
memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
|
||||||
ieee80211_rx_irqsafe(dev->wl->hw, skb);
|
ieee80211_rx_irqsafe(dev->wl->hw, skb);
|
||||||
|
|
||||||
|
|
|
@ -587,7 +587,6 @@ static void xemaclite_rx_handler(struct net_device *dev)
|
||||||
|
|
||||||
dev->stats.rx_packets++;
|
dev->stats.rx_packets++;
|
||||||
dev->stats.rx_bytes += len;
|
dev->stats.rx_bytes += len;
|
||||||
dev->last_rx = jiffies;
|
|
||||||
|
|
||||||
netif_rx(skb); /* Send the packet upstream */
|
netif_rx(skb); /* Send the packet upstream */
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,6 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
|
||||||
priv->stats.rx_packets++;
|
priv->stats.rx_packets++;
|
||||||
priv->stats.rx_bytes += skblen;
|
priv->stats.rx_bytes += skblen;
|
||||||
netif_rx_ni(skb);
|
netif_rx_ni(skb);
|
||||||
dev->last_rx = jiffies;
|
|
||||||
if (len > 0) {
|
if (len > 0) {
|
||||||
skb_pull(pskb, header->length);
|
skb_pull(pskb, header->length);
|
||||||
if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
|
if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
|
||||||
|
|
|
@ -676,7 +676,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
|
||||||
* we must use netif_rx_ni() instead of netif_rx()
|
* we must use netif_rx_ni() instead of netif_rx()
|
||||||
*/
|
*/
|
||||||
netif_rx_ni(skb);
|
netif_rx_ni(skb);
|
||||||
dev->last_rx = jiffies;
|
|
||||||
skb_pull(pskb, header->next);
|
skb_pull(pskb, header->next);
|
||||||
skb_put(pskb, NETIUCV_HDRLEN);
|
skb_put(pskb, NETIUCV_HDRLEN);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
card->dev->last_rx = jiffies;
|
|
||||||
card->stats.rx_packets++;
|
card->stats.rx_packets++;
|
||||||
card->stats.rx_bytes += len;
|
card->stats.rx_bytes += len;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1987,7 +1987,6 @@ static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
card->dev->last_rx = jiffies;
|
|
||||||
card->stats.rx_packets++;
|
card->stats.rx_packets++;
|
||||||
card->stats.rx_bytes += len;
|
card->stats.rx_bytes += len;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue