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:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user