diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
commit | babcda74e9d96bb58fd9c6c5112dbdbff169e695 (patch) | |
tree | fcbe5e70f1fff01ad49504171e964c387a5ad7f8 /drivers/net/irda | |
parent | ab2910921064b657610a3b501358a305e13087ea (diff) |
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>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/au1k_ir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/irda-usb.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ksdazzle-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/sa1100_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/stir4200.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 1 |
13 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 2ff181861d2d..9fde748c41f2 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -1931,7 +1931,6 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1931 | skb_reset_mac_header(skb); | 1931 | skb_reset_mac_header(skb); |
1932 | skb->protocol = htons(ETH_P_IRDA); | 1932 | skb->protocol = htons(ETH_P_IRDA); |
1933 | netif_rx(skb); | 1933 | netif_rx(skb); |
1934 | self->netdev->last_rx = jiffies; | ||
1935 | } | 1934 | } |
1936 | } | 1935 | } |
1937 | 1936 | ||
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index a1e4508717c8..6c4b53ffbcac 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -620,7 +620,6 @@ static int au1k_irda_rx(struct net_device *dev) | |||
620 | /* next descriptor */ | 620 | /* next descriptor */ |
621 | prxd = aup->rx_ring[aup->rx_head]; | 621 | prxd = aup->rx_ring[aup->rx_head]; |
622 | flags = prxd->flags; | 622 | flags = prxd->flags; |
623 | dev->last_rx = jiffies; | ||
624 | 623 | ||
625 | } | 624 | } |
626 | return 0; | 625 | return 0; |
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index b5d6b9ac162a..761ed8ca6e37 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -929,7 +929,6 @@ static void irda_usb_receive(struct urb *urb) | |||
929 | /* Keep stats up to date */ | 929 | /* Keep stats up to date */ |
930 | self->stats.rx_bytes += len; | 930 | self->stats.rx_bytes += len; |
931 | self->stats.rx_packets++; | 931 | self->stats.rx_packets++; |
932 | self->netdev->last_rx = jiffies; | ||
933 | 932 | ||
934 | done: | 933 | done: |
935 | /* Note : at this point, the URB we've just received (urb) | 934 | /* Note : at this point, the URB we've just received (urb) |
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index e1429fc6d050..c747c874d44d 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c | |||
@@ -235,7 +235,6 @@ static void kingsun_rcv_irq(struct urb *urb) | |||
235 | &kingsun->stats, | 235 | &kingsun->stats, |
236 | &kingsun->rx_buff, bytes[i]); | 236 | &kingsun->rx_buff, bytes[i]); |
237 | } | 237 | } |
238 | kingsun->netdev->last_rx = jiffies; | ||
239 | do_gettimeofday(&kingsun->rx_time); | 238 | do_gettimeofday(&kingsun->rx_time); |
240 | kingsun->receiving = | 239 | kingsun->receiving = |
241 | (kingsun->rx_buff.state != OUTSIDE_FRAME) | 240 | (kingsun->rx_buff.state != OUTSIDE_FRAME) |
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index 2482d61662a2..f59d5b6b7bfe 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -475,7 +475,6 @@ static void ks959_rcv_irq(struct urb *urb) | |||
475 | bytes[i]); | 475 | bytes[i]); |
476 | } | 476 | } |
477 | } | 477 | } |
478 | kingsun->netdev->last_rx = jiffies; | ||
479 | do_gettimeofday(&kingsun->rx_time); | 478 | do_gettimeofday(&kingsun->rx_time); |
480 | kingsun->receiving = | 479 | kingsun->receiving = |
481 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; | 480 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; |
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 1e0de93fd618..6c39f3f6d4e6 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c | |||
@@ -372,7 +372,6 @@ static void ksdazzle_rcv_irq(struct urb *urb) | |||
372 | async_unwrap_char(kingsun->netdev, &kingsun->stats, | 372 | async_unwrap_char(kingsun->netdev, &kingsun->stats, |
373 | &kingsun->rx_unwrap_buff, bytes[i]); | 373 | &kingsun->rx_unwrap_buff, bytes[i]); |
374 | } | 374 | } |
375 | kingsun->netdev->last_rx = jiffies; | ||
376 | kingsun->receiving = | 375 | kingsun->receiving = |
377 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; | 376 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; |
378 | } | 377 | } |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index ad92d3ff1c40..904c9610c0dd 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -806,7 +806,6 @@ static void mcs_receive_irq(struct urb *urb) | |||
806 | mcs_unwrap_fir(mcs, urb->transfer_buffer, | 806 | mcs_unwrap_fir(mcs, urb->transfer_buffer, |
807 | urb->actual_length); | 807 | urb->actual_length); |
808 | } | 808 | } |
809 | mcs->netdev->last_rx = jiffies; | ||
810 | do_gettimeofday(&mcs->rx_time); | 809 | do_gettimeofday(&mcs->rx_time); |
811 | } | 810 | } |
812 | 811 | ||
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 8583d951a6ad..4e1bc08971a8 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1896,7 +1896,6 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase) | |||
1896 | skb_reset_mac_header(skb); | 1896 | skb_reset_mac_header(skb); |
1897 | skb->protocol = htons(ETH_P_IRDA); | 1897 | skb->protocol = htons(ETH_P_IRDA); |
1898 | netif_rx(skb); | 1898 | netif_rx(skb); |
1899 | self->netdev->last_rx = jiffies; | ||
1900 | } | 1899 | } |
1901 | } | 1900 | } |
1902 | /* Restore bank register */ | 1901 | /* Restore bank register */ |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index c5b02b66f756..a0ee05318155 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -225,7 +225,6 @@ static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id) | |||
225 | } | 225 | } |
226 | lsr = STLSR; | 226 | lsr = STLSR; |
227 | } | 227 | } |
228 | dev->last_rx = jiffies; | ||
229 | si->last_oscr = OSCR; | 228 | si->last_oscr = OSCR; |
230 | break; | 229 | break; |
231 | 230 | ||
@@ -237,7 +236,6 @@ static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id) | |||
237 | si->stats.rx_bytes++; | 236 | si->stats.rx_bytes++; |
238 | async_unwrap_char(dev, &si->stats, &si->rx_buff, STRBR); | 237 | async_unwrap_char(dev, &si->stats, &si->rx_buff, STRBR); |
239 | } while (STLSR & LSR_DR); | 238 | } while (STLSR & LSR_DR); |
240 | dev->last_rx = jiffies; | ||
241 | si->last_oscr = OSCR; | 239 | si->last_oscr = OSCR; |
242 | break; | 240 | break; |
243 | 241 | ||
@@ -397,8 +395,6 @@ static void pxa_irda_fir_irq_eif(struct pxa_irda *si, struct net_device *dev, in | |||
397 | 395 | ||
398 | si->stats.rx_packets++; | 396 | si->stats.rx_packets++; |
399 | si->stats.rx_bytes += len; | 397 | si->stats.rx_bytes += len; |
400 | |||
401 | dev->last_rx = jiffies; | ||
402 | } | 398 | } |
403 | } | 399 | } |
404 | 400 | ||
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index a95188948de7..aa6fef8ff130 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
@@ -410,7 +410,6 @@ static void sa1100_irda_hpsir_irq(struct net_device *dev) | |||
410 | Ser2UTDR); | 410 | Ser2UTDR); |
411 | } while (Ser2UTSR1 & UTSR1_RNE); | 411 | } while (Ser2UTSR1 & UTSR1_RNE); |
412 | 412 | ||
413 | dev->last_rx = jiffies; | ||
414 | } | 413 | } |
415 | 414 | ||
416 | if (status & UTSR0_TFS && si->tx_buff.len) { | 415 | 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 | |||
515 | sa1100_irda_rx_alloc(si); | 514 | sa1100_irda_rx_alloc(si); |
516 | 515 | ||
517 | netif_rx(skb); | 516 | netif_rx(skb); |
518 | dev->last_rx = jiffies; | ||
519 | } else { | 517 | } else { |
520 | /* | 518 | /* |
521 | * Remap the buffer. | 519 | * Remap the buffer. |
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index 3575804fd7c6..ca4cd9266e55 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c | |||
@@ -824,7 +824,6 @@ static void stir_rcv_irq(struct urb *urb) | |||
824 | unwrap_chars(stir, urb->transfer_buffer, | 824 | unwrap_chars(stir, urb->transfer_buffer, |
825 | urb->actual_length); | 825 | urb->actual_length); |
826 | 826 | ||
827 | stir->netdev->last_rx = jiffies; | ||
828 | do_gettimeofday(&stir->rx_time); | 827 | do_gettimeofday(&stir->rx_time); |
829 | } | 828 | } |
830 | 829 | ||
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 9c926d205de9..a3d27d78fc89 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -600,7 +600,6 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd) | |||
600 | netif_rx(skb); | 600 | netif_rx(skb); |
601 | else | 601 | else |
602 | netif_rx_ni(skb); | 602 | netif_rx_ni(skb); |
603 | ndev->last_rx = jiffies; | ||
604 | 603 | ||
605 | done: | 604 | done: |
606 | rd_set_status(rd, 0); | 605 | rd_set_status(rd, 0); |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 002a6d769f21..fa600200ac01 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -923,7 +923,6 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self) | |||
923 | skb_reset_mac_header(skb); | 923 | skb_reset_mac_header(skb); |
924 | skb->protocol = htons(ETH_P_IRDA); | 924 | skb->protocol = htons(ETH_P_IRDA); |
925 | netif_rx(skb); | 925 | netif_rx(skb); |
926 | self->netdev->last_rx = jiffies; | ||
927 | } | 926 | } |
928 | } | 927 | } |
929 | /* Restore set register */ | 928 | /* Restore set register */ |