mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 15:50:59 +07:00
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>
This commit is contained in:
parent
ab29109210
commit
babcda74e9
@ -725,7 +725,6 @@ static void el_receive(struct net_device *dev)
|
||||
insb(DATAPORT, skb_put(skb, pkt_len), pkt_len);
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -672,7 +672,6 @@ static irqreturn_t elp_interrupt(int irq, void *dev_id)
|
||||
skb->protocol = eth_type_trans(skb,dev);
|
||||
dev->stats.rx_bytes += skb->len;
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
adapter->dmaing = 0;
|
||||
|
@ -865,7 +865,6 @@ static void el16_rx(struct net_device *dev)
|
||||
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -1074,7 +1074,6 @@ el3_rx(struct net_device *dev)
|
||||
outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
|
||||
skb->protocol = eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
dev->stats.rx_packets++;
|
||||
continue;
|
||||
|
@ -1301,7 +1301,6 @@ static int corkscrew_rx(struct net_device *dev)
|
||||
outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
/* Wait a limited time to go to next packet. */
|
||||
@ -1388,7 +1387,6 @@ static int boomerang_rx(struct net_device *dev)
|
||||
}
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
}
|
||||
entry = (++vp->cur_rx) % RX_RING_SIZE;
|
||||
|
@ -983,7 +983,6 @@ static void elmc_rcv_int(struct net_device *dev)
|
||||
skb_copy_to_linear_data(skb, (char *) p->base+(unsigned long) rbd->buffer,totlen);
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += totlen;
|
||||
} else {
|
||||
|
@ -1186,7 +1186,6 @@ static void mc32_rx_ring(struct net_device *dev)
|
||||
}
|
||||
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += length;
|
||||
netif_rx(skb);
|
||||
|
@ -2446,7 +2446,6 @@ static int vortex_rx(struct net_device *dev)
|
||||
iowrite16(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
/* Wait a limited time to go to next packet. */
|
||||
for (i = 200; i >= 0; i--)
|
||||
@ -2529,7 +2528,6 @@ boomerang_rx(struct net_device *dev)
|
||||
}
|
||||
}
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
}
|
||||
entry = (++vp->cur_rx) % RX_RING_SIZE;
|
||||
|
@ -336,7 +336,6 @@ static int lance_rx (struct net_device *dev)
|
||||
len);
|
||||
skb->protocol = eth_type_trans (skb, dev);
|
||||
netif_rx (skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += len;
|
||||
}
|
||||
|
@ -457,7 +457,6 @@ static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
|
||||
|
||||
cp->dev->stats.rx_packets++;
|
||||
cp->dev->stats.rx_bytes += skb->len;
|
||||
cp->dev->last_rx = jiffies;
|
||||
|
||||
#if CP_VLAN_TAG_USED
|
||||
if (cp->vlgrp && (desc->opts2 & cpu_to_le32(RxVlanTagged))) {
|
||||
|
@ -2025,7 +2025,6 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
|
||||
|
||||
skb->protocol = eth_type_trans (skb, dev);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_bytes += pkt_size;
|
||||
dev->stats.rx_packets++;
|
||||
|
||||
|
@ -841,7 +841,6 @@ static inline int i596_rx(struct net_device *dev)
|
||||
pkt_len);
|
||||
#endif
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes+=pkt_len;
|
||||
}
|
||||
|
@ -324,7 +324,6 @@ static int lance_rx (struct net_device *dev)
|
||||
len);
|
||||
skb->protocol = eth_type_trans (skb, dev);
|
||||
netif_rx (skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += len;
|
||||
}
|
||||
|
@ -2033,7 +2033,6 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
|
||||
#endif
|
||||
netif_rx(skb);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += retdesc->size;
|
||||
|
||||
|
@ -809,7 +809,6 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
|
||||
lp->coal_conf.rx_packets++;
|
||||
lp->coal_conf.rx_bytes += pkt_len;
|
||||
num_rx_pkt++;
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
err_next_pkt:
|
||||
lp->rx_ring[rx_index].buff_phy_addr
|
||||
|
@ -851,7 +851,6 @@ static void cops_rx(struct net_device *dev)
|
||||
|
||||
/* Send packet to a higher place. */
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
static void cops_timeout(struct net_device *dev)
|
||||
|
@ -783,7 +783,6 @@ static int sendup_buffer (struct net_device *dev)
|
||||
|
||||
/* toss it onwards */
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -125,7 +125,6 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
skb->protocol = __constant_htons(ETH_P_ARCNET);
|
||||
;
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
|
||||
|
@ -151,7 +151,6 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
skb->protocol = __constant_htons(ETH_P_ARCNET);
|
||||
;
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
|
||||
|
@ -159,7 +159,6 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
|
||||
skb->protocol = type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
|
||||
|
@ -230,7 +230,6 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
|
||||
skb->protocol = type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
} else { /* split packet */
|
||||
/*
|
||||
* NOTE: MSDOS ARP packet correction should only need to apply to
|
||||
@ -366,7 +365,6 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
|
||||
skb->protocol = type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -753,7 +753,6 @@ static int ariadne_rx(struct net_device *dev)
|
||||
#endif
|
||||
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -532,7 +532,6 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
|
||||
am_writeword(dev, hdraddr + 2, RMD_OWN);
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
priv->stats.rx_bytes += len;
|
||||
priv->stats.rx_packets ++;
|
||||
} else {
|
||||
|
@ -893,7 +893,6 @@ static void at91ether_rx(struct net_device *dev)
|
||||
memcpy(skb_put(skb, pktlen), p_recv, pktlen);
|
||||
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_bytes += pktlen;
|
||||
netif_rx(skb);
|
||||
}
|
||||
|
@ -259,8 +259,6 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
|
||||
skb_put(skb, length);
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
netif_receive_skb(skb);
|
||||
|
||||
ep->stats.rx_packets++;
|
||||
|
@ -588,7 +588,6 @@ static int eth_poll(struct napi_struct *napi, int budget)
|
||||
debug_pkt(dev, "eth_poll", skb->data, skb->len);
|
||||
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
dev->last_rx = jiffies;
|
||||
port->stat.rx_packets++;
|
||||
port->stat.rx_bytes += skb->len;
|
||||
netif_receive_skb(skb);
|
||||
|
@ -767,7 +767,6 @@ net_rx(struct net_device *dev)
|
||||
insw(ioaddr + DATAPORT, skb_put(skb,pkt_len), (pkt_len + 1) >> 1);
|
||||
skb->protocol=eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -1030,7 +1030,6 @@ static int lance_rx( struct net_device *dev )
|
||||
lp->memcpy_f( skb->data, PKTBUF_ADDR(head), pkt_len );
|
||||
skb->protocol = eth_type_trans( skb, dev );
|
||||
netif_rx( skb );
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -1460,7 +1460,6 @@ static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que,
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
||||
netdev->last_rx = jiffies;
|
||||
skip_pkt:
|
||||
/* skip current packet whether it's ok or not. */
|
||||
rx_page->read_offset +=
|
||||
|
@ -2028,8 +2028,6 @@ static void atl1_intr_rx(struct atl1_adapter *adapter)
|
||||
buffer_info->skb = NULL;
|
||||
buffer_info->alloced = 0;
|
||||
rrd->xsz.valid = 0;
|
||||
|
||||
adapter->netdev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
atomic_set(&rrd_ring->next_to_clean, rrd_next_to_clean);
|
||||
|
@ -437,7 +437,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
|
||||
netif_rx(skb);
|
||||
netdev->stats.rx_bytes += rx_size;
|
||||
netdev->stats.rx_packets++;
|
||||
netdev->last_rx = jiffies;
|
||||
} else {
|
||||
netdev->stats.rx_errors++;
|
||||
|
||||
|
@ -1240,7 +1240,6 @@ static int au1000_rx(struct net_device *dev)
|
||||
/* next descriptor */
|
||||
prxd = aup->rx_dma_ring[aup->rx_head];
|
||||
buff_stat = prxd->buff_stat;
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -829,7 +829,6 @@ static int b44_rx(struct b44 *bp, int budget)
|
||||
skb->ip_summed = CHECKSUM_NONE;
|
||||
skb->protocol = eth_type_trans(skb, bp->dev);
|
||||
netif_receive_skb(skb);
|
||||
bp->dev->last_rx = jiffies;
|
||||
received++;
|
||||
budget--;
|
||||
next_pkt:
|
||||
|
@ -741,7 +741,6 @@ static void bfin_mac_rx(struct net_device *dev)
|
||||
blackfin_dcache_invalidate_range((unsigned long)skb->head,
|
||||
(unsigned long)skb->tail);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
#if defined(BFIN_MAC_CSUM_OFFLOAD)
|
||||
skb->csum = current_rx_ptr->status.ip_payload_csum;
|
||||
|
@ -716,13 +716,11 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
|
||||
skb_put(skb, nb);
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
++dev->stats.rx_packets;
|
||||
dev->stats.rx_bytes += nb;
|
||||
} else {
|
||||
++dev->stats.rx_dropped;
|
||||
}
|
||||
dev->last_rx = jiffies;
|
||||
if ((skb = bp->rx_bufs[i]) == NULL) {
|
||||
bp->rx_bufs[i] = skb = dev_alloc_skb(RX_BUFLEN+2);
|
||||
if (skb != NULL)
|
||||
|
@ -3000,7 +3000,6 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
|
||||
#endif
|
||||
netif_receive_skb(skb);
|
||||
|
||||
bp->dev->last_rx = jiffies;
|
||||
rx_pkt++;
|
||||
|
||||
next_rx:
|
||||
|
@ -1328,7 +1328,6 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
|
||||
dev_kfree_skb(skb);
|
||||
}
|
||||
|
||||
bp->dev->last_rx = jiffies;
|
||||
|
||||
/* put new skb in bin */
|
||||
fp->tpa_pool[queue].skb = new_skb;
|
||||
@ -1557,7 +1556,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
|
||||
#endif
|
||||
netif_receive_skb(skb);
|
||||
|
||||
bp->dev->last_rx = jiffies;
|
||||
|
||||
next_rx:
|
||||
rx_buf->skb = NULL;
|
||||
@ -8767,7 +8765,6 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
|
||||
rc = 0;
|
||||
|
||||
test_loopback_rx_exit:
|
||||
bp->dev->last_rx = jiffies;
|
||||
|
||||
fp->rx_bd_cons = NEXT_RX_IDX(fp->rx_bd_cons);
|
||||
fp->rx_bd_prod = NEXT_RX_IDX(fp->rx_bd_prod);
|
||||
|
@ -2405,7 +2405,6 @@ static int cas_rx_ringN(struct cas *cp, int ring, int budget)
|
||||
cp->net_stats[ring].rx_packets++;
|
||||
cp->net_stats[ring].rx_bytes += len;
|
||||
spin_unlock(&cp->stat_lock[ring]);
|
||||
cp->dev->last_rx = jiffies;
|
||||
|
||||
next:
|
||||
npackets++;
|
||||
|
@ -1385,7 +1385,6 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
|
||||
st = per_cpu_ptr(sge->port_stats[p->iff], smp_processor_id());
|
||||
|
||||
skb->protocol = eth_type_trans(skb, adapter->port[p->iff].dev);
|
||||
skb->dev->last_rx = jiffies;
|
||||
if ((adapter->flags & RX_CSUM_ENABLED) && p->csum == 0xffff &&
|
||||
skb->protocol == htons(ETH_P_IP) &&
|
||||
(skb->data[9] == IPPROTO_TCP || skb->data[9] == IPPROTO_UDP)) {
|
||||
|
@ -1024,7 +1024,6 @@ dma_rx(struct net_device *dev)
|
||||
}
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += length;
|
||||
}
|
||||
@ -1718,7 +1717,6 @@ net_rx(struct net_device *dev)
|
||||
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += length;
|
||||
}
|
||||
|
@ -1876,7 +1876,6 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
|
||||
|
||||
skb_pull(skb, sizeof(*p) + pad);
|
||||
skb->protocol = eth_type_trans(skb, adap->port[p->iff]);
|
||||
skb->dev->last_rx = jiffies;
|
||||
pi = netdev_priv(skb->dev);
|
||||
if (pi->rx_csum_offload && p->csum_valid && p->csum == htons(0xffff) &&
|
||||
!p->fragment) {
|
||||
|
@ -369,7 +369,6 @@ static void de600_rx_intr(struct net_device *dev)
|
||||
netif_rx(skb);
|
||||
|
||||
/* update stats */
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++; /* count all receives */
|
||||
dev->stats.rx_bytes += size; /* count all received bytes */
|
||||
|
||||
|
@ -686,7 +686,6 @@ static int de620_rx_intr(struct net_device *dev)
|
||||
PRINTK(("Read %d bytes\n", size));
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb); /* deliver it "upstairs" */
|
||||
dev->last_rx = jiffies;
|
||||
/* count all receives */
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += size;
|
||||
|
@ -622,7 +622,6 @@ static int lance_rx(struct net_device *dev)
|
||||
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
}
|
||||
|
||||
|
@ -3103,7 +3103,6 @@ static void dfx_rcv_queue_process(
|
||||
netif_rx(skb);
|
||||
|
||||
/* Update the rcv counters */
|
||||
bp->dev->last_rx = jiffies;
|
||||
bp->rcv_total_frames++;
|
||||
if (*(p_buff + RCV_BUFF_K_DA) & 0x01)
|
||||
bp->rcv_multicast_frames++;
|
||||
|
@ -1056,7 +1056,6 @@ static int depca_rx(struct net_device *dev)
|
||||
/*
|
||||
** Update stats
|
||||
*/
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
for (i = 1; i < DEPCA_PKT_STAT_SZ - 1; i++) {
|
||||
|
@ -891,7 +891,6 @@ receive_packet (struct net_device *dev)
|
||||
}
|
||||
#endif
|
||||
netif_rx (skb);
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
entry = (entry + 1) % RX_RING_SIZE;
|
||||
}
|
||||
|
@ -1880,7 +1880,6 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
|
||||
} else {
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += actual_size;
|
||||
nic->netdev->last_rx = jiffies;
|
||||
netif_receive_skb(skb);
|
||||
if(work_done)
|
||||
(*work_done)++;
|
||||
|
@ -4099,8 +4099,6 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
||||
netdev->last_rx = jiffies;
|
||||
|
||||
next_desc:
|
||||
rx_desc->status = 0;
|
||||
|
||||
|
@ -103,8 +103,6 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
|
||||
le16_to_cpu(vlan));
|
||||
else
|
||||
netif_receive_skb(skb);
|
||||
|
||||
netdev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1580,7 +1580,6 @@ eepro_rx(struct net_device *dev)
|
||||
|
||||
skb->protocol = eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
}
|
||||
|
||||
|
@ -967,7 +967,6 @@ static void eexp_hw_rx_pio(struct net_device *dev)
|
||||
insw(ioaddr+DATAPORT, skb_put(skb,pkt_len),(pkt_len+1)>>1);
|
||||
skb->protocol = eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -728,7 +728,6 @@ static int ehea_proc_rwqes(struct net_device *dev,
|
||||
}
|
||||
|
||||
ehea_proc_skb(pr, cqe, skb);
|
||||
dev->last_rx = jiffies;
|
||||
} else {
|
||||
pr->p_stats.poll_receive_errors++;
|
||||
port_reset = ehea_treat_poll_error(pr, rq, cqe,
|
||||
|
@ -944,7 +944,6 @@ static void enc28j60_hw_rx(struct net_device *ndev)
|
||||
/* update statistics */
|
||||
ndev->stats.rx_packets++;
|
||||
ndev->stats.rx_bytes += len;
|
||||
ndev->last_rx = jiffies;
|
||||
netif_rx(skb);
|
||||
}
|
||||
}
|
||||
|
@ -951,7 +951,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
|
||||
}
|
||||
|
||||
skb->dev = enic->netdev;
|
||||
enic->netdev->last_rx = jiffies;
|
||||
|
||||
if (enic->vlan_group && vlan_stripped) {
|
||||
|
||||
|
@ -1222,7 +1222,6 @@ static int epic_rx(struct net_device *dev, int budget)
|
||||
}
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_receive_skb(skb);
|
||||
dev->last_rx = jiffies;
|
||||
ep->stats.rx_packets++;
|
||||
ep->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -1205,7 +1205,6 @@ static void eth16i_rx(struct net_device *dev)
|
||||
printk(KERN_DEBUG ".\n");
|
||||
}
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
|
||||
|
@ -1026,7 +1026,6 @@ static int ewrk3_rx(struct net_device *dev)
|
||||
/*
|
||||
** Update stats
|
||||
*/
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
} else {
|
||||
|
@ -1726,7 +1726,6 @@ static int netdev_rx(struct net_device *dev)
|
||||
}
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
np->stats.rx_packets++;
|
||||
np->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -487,7 +487,6 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
|
||||
rskb->protocol = eth_type_trans(rskb, dev);
|
||||
|
||||
netif_rx(rskb);
|
||||
dev->last_rx = jiffies;
|
||||
} else {
|
||||
/* Can't get a new one : reuse the same & drop pkt */
|
||||
dev_notice(&dev->dev, "Memory squeeze, dropping packet.\n");
|
||||
|
@ -2735,7 +2735,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
|
||||
#else
|
||||
netif_rx(skb);
|
||||
#endif
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += len;
|
||||
next_pkt:
|
||||
@ -2848,7 +2847,6 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
|
||||
}
|
||||
}
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += len;
|
||||
} else {
|
||||
|
@ -1693,8 +1693,6 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
priv->rx_skbuff[priv->skb_currx] = newskb;
|
||||
|
||||
/* Setup the new bdp */
|
||||
|
@ -1645,7 +1645,6 @@ static int hamachi_rx(struct net_device *dev)
|
||||
#endif /* RX_CHECKSUM */
|
||||
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
hmp->stats.rx_packets++;
|
||||
}
|
||||
entry = (++hmp->cur_rx) % RX_RING_SIZE;
|
||||
|
@ -373,7 +373,6 @@ static void sp_bump(struct sixpack *sp, char cmd)
|
||||
memcpy(ptr, sp->cooked_buf + 1, count);
|
||||
skb->protocol = ax25_type_trans(skb, sp->dev);
|
||||
netif_rx(skb);
|
||||
sp->dev->last_rx = jiffies;
|
||||
sp->dev->stats.rx_packets++;
|
||||
|
||||
return;
|
||||
|
@ -555,7 +555,6 @@ static void do_rxpacket(struct net_device *dev)
|
||||
memcpy(cp, bc->hdlcrx.buf, pktlen - 1);
|
||||
skb->protocol = ax25_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
bc->stats.rx_packets++;
|
||||
}
|
||||
|
||||
|
@ -230,7 +230,6 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
|
||||
|
||||
skb->protocol = ax25_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
unlock:
|
||||
|
||||
rcu_read_unlock();
|
||||
|
@ -1283,7 +1283,6 @@ static void rx_bh(struct work_struct *ugli_api)
|
||||
memcpy(&data[1], priv->rx_buf[i], cb);
|
||||
skb->protocol = ax25_type_trans(skb, priv->dev);
|
||||
netif_rx(skb);
|
||||
priv->dev->last_rx = jiffies;
|
||||
priv->stats.rx_packets++;
|
||||
priv->stats.rx_bytes += cb;
|
||||
}
|
||||
|
@ -162,7 +162,6 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
|
||||
memcpy(cp, s->hdlcrx.buffer, pkt_len - 1);
|
||||
skb->protocol = ax25_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
s->stats.rx_packets++;
|
||||
}
|
||||
|
||||
|
@ -303,7 +303,6 @@ static void ax_bump(struct mkiss *ax)
|
||||
memcpy(skb_put(skb,count), ax->rbuff, count);
|
||||
skb->protocol = ax25_type_trans(skb, ax->dev);
|
||||
netif_rx(skb);
|
||||
ax->dev->last_rx = jiffies;
|
||||
ax->stats.rx_packets++;
|
||||
ax->stats.rx_bytes += count;
|
||||
spin_unlock_bh(&ax->buflock);
|
||||
|
@ -1627,7 +1627,6 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
|
||||
skb->protocol = ax25_type_trans(skb, scc->dev);
|
||||
|
||||
netif_rx(skb);
|
||||
scc->dev->last_rx = jiffies;
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -515,7 +515,6 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
|
||||
memcpy(cp, yp->rx_buf, pkt_len - 1);
|
||||
skb->protocol = ax25_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
++yp->stats.rx_packets;
|
||||
}
|
||||
}
|
||||
|
@ -1834,7 +1834,6 @@ static void hp100_rx(struct net_device *dev)
|
||||
ptr[9], ptr[10], ptr[11]);
|
||||
#endif
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
@ -1925,7 +1924,6 @@ static void hp100_rx_bm(struct net_device *dev)
|
||||
|
||||
netif_rx(ptr->skb); /* Up and away... */
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -605,7 +605,6 @@ static void irqrx_handler(struct net_device *dev)
|
||||
skb->ip_summed = CHECKSUM_NONE;
|
||||
|
||||
/* bookkeeping */
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += rda.length;
|
||||
|
||||
|
@ -1014,7 +1014,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
|
||||
netdev->stats.rx_packets++;
|
||||
netdev->stats.rx_bytes += length;
|
||||
frames_processed++;
|
||||
netdev->last_rx = jiffies;
|
||||
}
|
||||
} while (frames_processed < budget);
|
||||
|
||||
|
@ -3940,8 +3940,6 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring,
|
||||
|
||||
igb_receive_skb(rx_ring, staterr, rx_desc, skb);
|
||||
|
||||
netdev->last_rx = jiffies;
|
||||
|
||||
next_desc:
|
||||
rx_desc->wb.upper.status_error = 0;
|
||||
|
||||
|
@ -621,7 +621,6 @@ static inline void ioc3_rx(struct ioc3_private *ip)
|
||||
rxb = (struct ioc3_erxbuf *) new_skb->data;
|
||||
skb_reserve(new_skb, RX_OFFSET);
|
||||
|
||||
priv_netdev(ip)->last_rx = jiffies;
|
||||
ip->stats.rx_packets++; /* Statistics */
|
||||
ip->stats.rx_bytes += len;
|
||||
} else {
|
||||
|
@ -1222,7 +1222,6 @@ static void ipg_nic_rx_with_start_and_end(struct net_device *dev,
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
skb->ip_summed = CHECKSUM_NONE;
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
sp->rx_buff[entry] = NULL;
|
||||
}
|
||||
|
||||
@ -1256,7 +1255,6 @@ static void ipg_nic_rx_with_start(struct net_device *dev,
|
||||
jumbo->skb = skb;
|
||||
|
||||
sp->rx_buff[entry] = NULL;
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
static void ipg_nic_rx_with_end(struct net_device *dev,
|
||||
@ -1292,7 +1290,6 @@ static void ipg_nic_rx_with_end(struct net_device *dev,
|
||||
}
|
||||
}
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
jumbo->found_start = 0;
|
||||
jumbo->current_size = 0;
|
||||
jumbo->skb = NULL;
|
||||
@ -1325,7 +1322,6 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev,
|
||||
skb->data, sp->rxfrag_size);
|
||||
}
|
||||
}
|
||||
dev->last_rx = jiffies;
|
||||
ipg_nic_rx_free_skb(dev);
|
||||
}
|
||||
} else {
|
||||
@ -1494,11 +1490,6 @@ static int ipg_nic_rx(struct net_device *dev)
|
||||
* when processing completes.
|
||||
*/
|
||||
netif_rx(skb);
|
||||
|
||||
/* Record frame receive time (jiffies = Linux
|
||||
* kernel current time stamp).
|
||||
*/
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
/* Assure RX buffer is not reused by IPG. */
|
||||
|
@ -1931,7 +1931,6 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
|
||||
skb_reset_mac_header(skb);
|
||||
skb->protocol = htons(ETH_P_IRDA);
|
||||
netif_rx(skb);
|
||||
self->netdev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -620,7 +620,6 @@ static int au1k_irda_rx(struct net_device *dev)
|
||||
/* next descriptor */
|
||||
prxd = aup->rx_ring[aup->rx_head];
|
||||
flags = prxd->flags;
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
}
|
||||
return 0;
|
||||
|
@ -929,7 +929,6 @@ static void irda_usb_receive(struct urb *urb)
|
||||
/* Keep stats up to date */
|
||||
self->stats.rx_bytes += len;
|
||||
self->stats.rx_packets++;
|
||||
self->netdev->last_rx = jiffies;
|
||||
|
||||
done:
|
||||
/* Note : at this point, the URB we've just received (urb)
|
||||
|
@ -235,7 +235,6 @@ static void kingsun_rcv_irq(struct urb *urb)
|
||||
&kingsun->stats,
|
||||
&kingsun->rx_buff, bytes[i]);
|
||||
}
|
||||
kingsun->netdev->last_rx = jiffies;
|
||||
do_gettimeofday(&kingsun->rx_time);
|
||||
kingsun->receiving =
|
||||
(kingsun->rx_buff.state != OUTSIDE_FRAME)
|
||||
|
@ -475,7 +475,6 @@ static void ks959_rcv_irq(struct urb *urb)
|
||||
bytes[i]);
|
||||
}
|
||||
}
|
||||
kingsun->netdev->last_rx = jiffies;
|
||||
do_gettimeofday(&kingsun->rx_time);
|
||||
kingsun->receiving =
|
||||
(kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0;
|
||||
|
@ -372,7 +372,6 @@ static void ksdazzle_rcv_irq(struct urb *urb)
|
||||
async_unwrap_char(kingsun->netdev, &kingsun->stats,
|
||||
&kingsun->rx_unwrap_buff, bytes[i]);
|
||||
}
|
||||
kingsun->netdev->last_rx = jiffies;
|
||||
kingsun->receiving =
|
||||
(kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0;
|
||||
}
|
||||
|
@ -806,7 +806,6 @@ static void mcs_receive_irq(struct urb *urb)
|
||||
mcs_unwrap_fir(mcs, urb->transfer_buffer,
|
||||
urb->actual_length);
|
||||
}
|
||||
mcs->netdev->last_rx = jiffies;
|
||||
do_gettimeofday(&mcs->rx_time);
|
||||
}
|
||||
|
||||
|
@ -1896,7 +1896,6 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase)
|
||||
skb_reset_mac_header(skb);
|
||||
skb->protocol = htons(ETH_P_IRDA);
|
||||
netif_rx(skb);
|
||||
self->netdev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
/* Restore bank register */
|
||||
|
@ -225,7 +225,6 @@ static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id)
|
||||
}
|
||||
lsr = STLSR;
|
||||
}
|
||||
dev->last_rx = jiffies;
|
||||
si->last_oscr = OSCR;
|
||||
break;
|
||||
|
||||
@ -237,7 +236,6 @@ static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id)
|
||||
si->stats.rx_bytes++;
|
||||
async_unwrap_char(dev, &si->stats, &si->rx_buff, STRBR);
|
||||
} while (STLSR & LSR_DR);
|
||||
dev->last_rx = jiffies;
|
||||
si->last_oscr = OSCR;
|
||||
break;
|
||||
|
||||
@ -397,8 +395,6 @@ static void pxa_irda_fir_irq_eif(struct pxa_irda *si, struct net_device *dev, in
|
||||
|
||||
si->stats.rx_packets++;
|
||||
si->stats.rx_bytes += len;
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -410,7 +410,6 @@ static void sa1100_irda_hpsir_irq(struct net_device *dev)
|
||||
Ser2UTDR);
|
||||
} while (Ser2UTSR1 & UTSR1_RNE);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
}
|
||||
|
||||
if (status & UTSR0_TFS && si->tx_buff.len) {
|
||||
@ -515,7 +514,6 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
|
||||
sa1100_irda_rx_alloc(si);
|
||||
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
} else {
|
||||
/*
|
||||
* Remap the buffer.
|
||||
|
@ -824,7 +824,6 @@ static void stir_rcv_irq(struct urb *urb)
|
||||
unwrap_chars(stir, urb->transfer_buffer,
|
||||
urb->actual_length);
|
||||
|
||||
stir->netdev->last_rx = jiffies;
|
||||
do_gettimeofday(&stir->rx_time);
|
||||
}
|
||||
|
||||
|
@ -600,7 +600,6 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
|
||||
netif_rx(skb);
|
||||
else
|
||||
netif_rx_ni(skb);
|
||||
ndev->last_rx = jiffies;
|
||||
|
||||
done:
|
||||
rd_set_status(rd, 0);
|
||||
|
@ -923,7 +923,6 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)
|
||||
skb_reset_mac_header(skb);
|
||||
skb->protocol = htons(ETH_P_IRDA);
|
||||
netif_rx(skb);
|
||||
self->netdev->last_rx = jiffies;
|
||||
}
|
||||
}
|
||||
/* Restore set register */
|
||||
|
@ -583,7 +583,6 @@ net_rx(struct net_device *dev)
|
||||
insw(ioaddr, skb->data, (pkt_len + 1) >> 1);
|
||||
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -1980,7 +1980,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
|
||||
} else {
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
netdev->last_rx = jiffies;
|
||||
|
||||
rxdesc_done:
|
||||
/* clean up descriptor, might be written over by hw */
|
||||
|
@ -668,7 +668,6 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,
|
||||
|
||||
skb->protocol = eth_type_trans(skb, adapter->netdev);
|
||||
ixgbe_receive_skb(adapter, skb, staterr, rx_ring, rx_desc);
|
||||
adapter->netdev->last_rx = jiffies;
|
||||
|
||||
next_desc:
|
||||
rx_desc->wb.upper.status_error = 0;
|
||||
|
@ -114,8 +114,6 @@ static int ixpdev_rx(struct net_device *dev, int processed, int budget)
|
||||
skb_put(skb, desc->pkt_length);
|
||||
skb->protocol = eth_type_trans(skb, nds[desc->channel]);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
||||
|
@ -931,7 +931,6 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
|
||||
RXWBFLAG_DEST_MUL)
|
||||
++(NET_STAT(jme).multicast);
|
||||
|
||||
jme->dev->last_rx = jiffies;
|
||||
NET_STAT(jme).rx_bytes += framesize;
|
||||
++(NET_STAT(jme).rx_packets);
|
||||
}
|
||||
|
@ -409,7 +409,6 @@ static int korina_rx(struct net_device *dev, int limit)
|
||||
|
||||
/* Pass the packet to upper layers */
|
||||
netif_receive_skb(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
|
||||
|
@ -1190,7 +1190,6 @@ lance_rx(struct net_device *dev)
|
||||
pkt_len);
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes+=pkt_len;
|
||||
}
|
||||
|
@ -739,7 +739,6 @@ static inline int i596_rx(struct net_device *dev)
|
||||
skb->len = pkt_len;
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
|
@ -764,7 +764,6 @@ static void ei_receive(struct net_device *dev)
|
||||
ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame));
|
||||
skb->protocol=eth_type_trans(skb,dev);
|
||||
netif_rx(skb);
|
||||
dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
if (pkt_stat & ENRSR_PHY)
|
||||
|
@ -76,8 +76,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
|
||||
skb->protocol = eth_type_trans(skb,dev);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
/* it's OK to use per_cpu_ptr() because BHs are off */
|
||||
pcpu_lstats = dev->ml_priv;
|
||||
lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id());
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user