Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit babcda74 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent ab291092

drivers/net/3c501.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/3c505.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/3c507.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

		}

drivers/net/3c509.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/3c515.c

+0 −2
Original line number Diff line number Diff line
@@ -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;