diff options
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/cosa.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/cycx_x25.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/dlci.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/dscc4.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/farsync.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/hd6457x.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/hostess_sv11.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/lapbether.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/lmc/lmc_proto.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/sbni.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/sealevel.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/syncppp.c | 4 | ||||
-rw-r--r-- | drivers/net/wan/wanxl.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/x25_asy.c | 4 |
15 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 7f97f8d08c39..d80b72e22dea 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -754,7 +754,6 @@ static int cosa_net_rx_done(struct channel_data *chan) | |||
754 | chan->netdev->stats.rx_bytes += chan->cosa->rxsize; | 754 | chan->netdev->stats.rx_bytes += chan->cosa->rxsize; |
755 | netif_rx(chan->rx_skb); | 755 | netif_rx(chan->rx_skb); |
756 | chan->rx_skb = NULL; | 756 | chan->rx_skb = NULL; |
757 | chan->netdev->last_rx = jiffies; | ||
758 | return 0; | 757 | return 0; |
759 | } | 758 | } |
760 | 759 | ||
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index 5a7303dc0965..aeea321e4a9d 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c | |||
@@ -843,7 +843,6 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd) | |||
843 | 843 | ||
844 | skb_reset_mac_header(skb); | 844 | skb_reset_mac_header(skb); |
845 | netif_rx(skb); | 845 | netif_rx(skb); |
846 | dev->last_rx = jiffies; /* timestamp */ | ||
847 | } | 846 | } |
848 | 847 | ||
849 | /* Connect interrupt handler. */ | 848 | /* Connect interrupt handler. */ |
@@ -1494,7 +1493,6 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event) | |||
1494 | 1493 | ||
1495 | skb->protocol = x25_type_trans(skb, dev); | 1494 | skb->protocol = x25_type_trans(skb, dev); |
1496 | netif_rx(skb); | 1495 | netif_rx(skb); |
1497 | dev->last_rx = jiffies; /* timestamp */ | ||
1498 | } | 1496 | } |
1499 | 1497 | ||
1500 | /* Convert line speed in bps to a number used by cyclom 2x code. */ | 1498 | /* Convert line speed in bps to a number used by cyclom 2x code. */ |
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index b14242768fad..5d13832978eb 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c | |||
@@ -181,7 +181,6 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev) | |||
181 | dlp->stats.rx_bytes += skb->len; | 181 | dlp->stats.rx_bytes += skb->len; |
182 | netif_rx(skb); | 182 | netif_rx(skb); |
183 | dlp->stats.rx_packets++; | 183 | dlp->stats.rx_packets++; |
184 | dev->last_rx = jiffies; | ||
185 | } | 184 | } |
186 | else | 185 | else |
187 | dev_kfree_skb(skb); | 186 | dev_kfree_skb(skb); |
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 7d16ca3cb93c..888025db2f02 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -659,7 +659,6 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, | |||
659 | skb_put(skb, pkt_len); | 659 | skb_put(skb, pkt_len); |
660 | if (netif_running(dev)) | 660 | if (netif_running(dev)) |
661 | skb->protocol = hdlc_type_trans(skb, dev); | 661 | skb->protocol = hdlc_type_trans(skb, dev); |
662 | skb->dev->last_rx = jiffies; | ||
663 | netif_rx(skb); | 662 | netif_rx(skb); |
664 | } else { | 663 | } else { |
665 | if (skb->data[pkt_len] & FrameRdo) | 664 | if (skb->data[pkt_len] & FrameRdo) |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 9557ad078ab8..48a2c9d28950 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -896,7 +896,6 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port, | |||
896 | fst_process_rx_status(rx_status, port_to_dev(port)->name); | 896 | fst_process_rx_status(rx_status, port_to_dev(port)->name); |
897 | if (rx_status == NET_RX_DROP) | 897 | if (rx_status == NET_RX_DROP) |
898 | dev->stats.rx_dropped++; | 898 | dev->stats.rx_dropped++; |
899 | dev->last_rx = jiffies; | ||
900 | } | 899 | } |
901 | 900 | ||
902 | /* | 901 | /* |
@@ -1322,7 +1321,6 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port) | |||
1322 | fst_process_rx_status(rx_status, port_to_dev(port)->name); | 1321 | fst_process_rx_status(rx_status, port_to_dev(port)->name); |
1323 | if (rx_status == NET_RX_DROP) | 1322 | if (rx_status == NET_RX_DROP) |
1324 | dev->stats.rx_dropped++; | 1323 | dev->stats.rx_dropped++; |
1325 | dev->last_rx = jiffies; | ||
1326 | } else { | 1324 | } else { |
1327 | card->dma_skb_rx = skb; | 1325 | card->dma_skb_rx = skb; |
1328 | card->dma_port_rx = port; | 1326 | card->dma_port_rx = port; |
diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c index 591fb45a7c68..434583a94b32 100644 --- a/drivers/net/wan/hd6457x.c +++ b/drivers/net/wan/hd6457x.c | |||
@@ -328,7 +328,6 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, u1 | |||
328 | #endif | 328 | #endif |
329 | dev->stats.rx_packets++; | 329 | dev->stats.rx_packets++; |
330 | dev->stats.rx_bytes += skb->len; | 330 | dev->stats.rx_bytes += skb->len; |
331 | dev->last_rx = jiffies; | ||
332 | skb->protocol = hdlc_type_trans(skb, dev); | 331 | skb->protocol = hdlc_type_trans(skb, dev); |
333 | netif_rx(skb); | 332 | netif_rx(skb); |
334 | } | 333 | } |
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index e299313f828a..af54f0cf1b35 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c | |||
@@ -66,7 +66,6 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb) | |||
66 | * it right now. | 66 | * it right now. |
67 | */ | 67 | */ |
68 | netif_rx(skb); | 68 | netif_rx(skb); |
69 | c->netdevice->last_rx = jiffies; | ||
70 | } | 69 | } |
71 | 70 | ||
72 | /* | 71 | /* |
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 24fd613466b7..5b61b3eef45f 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
@@ -143,7 +143,6 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb) | |||
143 | *ptr = 0x00; | 143 | *ptr = 0x00; |
144 | 144 | ||
145 | skb->protocol = x25_type_trans(skb, dev); | 145 | skb->protocol = x25_type_trans(skb, dev); |
146 | skb->dev->last_rx = jiffies; | ||
147 | return netif_rx(skb); | 146 | return netif_rx(skb); |
148 | } | 147 | } |
149 | 148 | ||
@@ -235,7 +234,6 @@ static void lapbeth_connected(struct net_device *dev, int reason) | |||
235 | *ptr = 0x01; | 234 | *ptr = 0x01; |
236 | 235 | ||
237 | skb->protocol = x25_type_trans(skb, dev); | 236 | skb->protocol = x25_type_trans(skb, dev); |
238 | skb->dev->last_rx = jiffies; | ||
239 | netif_rx(skb); | 237 | netif_rx(skb); |
240 | } | 238 | } |
241 | 239 | ||
@@ -253,7 +251,6 @@ static void lapbeth_disconnected(struct net_device *dev, int reason) | |||
253 | *ptr = 0x02; | 251 | *ptr = 0x02; |
254 | 252 | ||
255 | skb->protocol = x25_type_trans(skb, dev); | 253 | skb->protocol = x25_type_trans(skb, dev); |
256 | skb->dev->last_rx = jiffies; | ||
257 | netif_rx(skb); | 254 | netif_rx(skb); |
258 | } | 255 | } |
259 | 256 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index d7bb63e616b5..feac3b99f8fe 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -1594,7 +1594,6 @@ static int lmc_rx(struct net_device *dev) | |||
1594 | goto skip_packet; | 1594 | goto skip_packet; |
1595 | } | 1595 | } |
1596 | 1596 | ||
1597 | dev->last_rx = jiffies; | ||
1598 | sc->lmc_device->stats.rx_packets++; | 1597 | sc->lmc_device->stats.rx_packets++; |
1599 | sc->lmc_device->stats.rx_bytes += len; | 1598 | sc->lmc_device->stats.rx_bytes += len; |
1600 | 1599 | ||
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index be9877ff551e..94b4c208b013 100644 --- a/drivers/net/wan/lmc/lmc_proto.c +++ b/drivers/net/wan/lmc/lmc_proto.c | |||
@@ -142,7 +142,6 @@ void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ | |||
142 | case LMC_PPP: | 142 | case LMC_PPP: |
143 | case LMC_NET: | 143 | case LMC_NET: |
144 | default: | 144 | default: |
145 | skb->dev->last_rx = jiffies; | ||
146 | netif_rx(skb); | 145 | netif_rx(skb); |
147 | break; | 146 | break; |
148 | case LMC_RAW: | 147 | case LMC_RAW: |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index ee51b6a5e605..6db063e2d5bb 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -1013,13 +1013,11 @@ indicate_pkt( struct net_device *dev ) | |||
1013 | #ifdef CONFIG_SBNI_MULTILINE | 1013 | #ifdef CONFIG_SBNI_MULTILINE |
1014 | skb->protocol = eth_type_trans( skb, nl->master ); | 1014 | skb->protocol = eth_type_trans( skb, nl->master ); |
1015 | netif_rx( skb ); | 1015 | netif_rx( skb ); |
1016 | dev->last_rx = jiffies; | ||
1017 | ++((struct net_local *) nl->master->priv)->stats.rx_packets; | 1016 | ++((struct net_local *) nl->master->priv)->stats.rx_packets; |
1018 | ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos; | 1017 | ((struct net_local *) nl->master->priv)->stats.rx_bytes += nl->inppos; |
1019 | #else | 1018 | #else |
1020 | skb->protocol = eth_type_trans( skb, dev ); | 1019 | skb->protocol = eth_type_trans( skb, dev ); |
1021 | netif_rx( skb ); | 1020 | netif_rx( skb ); |
1022 | dev->last_rx = jiffies; | ||
1023 | ++nl->stats.rx_packets; | 1021 | ++nl->stats.rx_packets; |
1024 | nl->stats.rx_bytes += nl->inppos; | 1022 | nl->stats.rx_bytes += nl->inppos; |
1025 | #endif | 1023 | #endif |
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index c0235844a4d5..0941a26f6e3f 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c | |||
@@ -68,7 +68,6 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb) | |||
68 | skb_reset_mac_header(skb); | 68 | skb_reset_mac_header(skb); |
69 | skb->dev = c->netdevice; | 69 | skb->dev = c->netdevice; |
70 | netif_rx(skb); | 70 | netif_rx(skb); |
71 | c->netdevice->last_rx = jiffies; | ||
72 | } | 71 | } |
73 | 72 | ||
74 | /* | 73 | /* |
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 6e92f7b44b1a..58ae8a2223af 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c | |||
@@ -284,7 +284,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb) | |||
284 | printk(KERN_DEBUG "Yow an IP frame.\n"); | 284 | printk(KERN_DEBUG "Yow an IP frame.\n"); |
285 | skb->protocol=htons(ETH_P_IP); | 285 | skb->protocol=htons(ETH_P_IP); |
286 | netif_rx(skb); | 286 | netif_rx(skb); |
287 | dev->last_rx = jiffies; | ||
288 | goto done; | 287 | goto done; |
289 | } | 288 | } |
290 | break; | 289 | break; |
@@ -294,7 +293,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb) | |||
294 | if (sp->lcp.state == LCP_STATE_OPENED) { | 293 | if (sp->lcp.state == LCP_STATE_OPENED) { |
295 | skb->protocol=htons(ETH_P_IPX); | 294 | skb->protocol=htons(ETH_P_IPX); |
296 | netif_rx(skb); | 295 | netif_rx(skb); |
297 | dev->last_rx = jiffies; | ||
298 | goto done; | 296 | goto done; |
299 | } | 297 | } |
300 | break; | 298 | break; |
@@ -321,14 +319,12 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb) | |||
321 | case ETH_P_IP: | 319 | case ETH_P_IP: |
322 | skb->protocol=htons(ETH_P_IP); | 320 | skb->protocol=htons(ETH_P_IP); |
323 | netif_rx(skb); | 321 | netif_rx(skb); |
324 | dev->last_rx = jiffies; | ||
325 | goto done; | 322 | goto done; |
326 | #endif | 323 | #endif |
327 | #ifdef CONFIG_IPX | 324 | #ifdef CONFIG_IPX |
328 | case ETH_P_IPX: | 325 | case ETH_P_IPX: |
329 | skb->protocol=htons(ETH_P_IPX); | 326 | skb->protocol=htons(ETH_P_IPX); |
330 | netif_rx(skb); | 327 | netif_rx(skb); |
331 | dev->last_rx = jiffies; | ||
332 | goto done; | 328 | goto done; |
333 | #endif | 329 | #endif |
334 | } | 330 | } |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index a8a5ca0ee6c2..88459490ecd2 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -220,7 +220,6 @@ static inline void wanxl_rx_intr(card_t *card) | |||
220 | #endif | 220 | #endif |
221 | dev->stats.rx_packets++; | 221 | dev->stats.rx_packets++; |
222 | dev->stats.rx_bytes += skb->len; | 222 | dev->stats.rx_bytes += skb->len; |
223 | dev->last_rx = jiffies; | ||
224 | skb->protocol = hdlc_type_trans(skb, dev); | 223 | skb->protocol = hdlc_type_trans(skb, dev); |
225 | netif_rx(skb); | 224 | netif_rx(skb); |
226 | skb = NULL; | 225 | skb = NULL; |
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 2a6c7a60756f..3b7bdfd25148 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
@@ -211,7 +211,6 @@ static void x25_asy_bump(struct x25_asy *sl) | |||
211 | printk(KERN_DEBUG "x25_asy: data received err - %d\n", err); | 211 | printk(KERN_DEBUG "x25_asy: data received err - %d\n", err); |
212 | } else { | 212 | } else { |
213 | netif_rx(skb); | 213 | netif_rx(skb); |
214 | sl->dev->last_rx = jiffies; | ||
215 | sl->stats.rx_packets++; | 214 | sl->stats.rx_packets++; |
216 | } | 215 | } |
217 | } | 216 | } |
@@ -361,7 +360,6 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) | |||
361 | 360 | ||
362 | static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb) | 361 | static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb) |
363 | { | 362 | { |
364 | skb->dev->last_rx = jiffies; | ||
365 | return netif_rx(skb); | 363 | return netif_rx(skb); |
366 | } | 364 | } |
367 | 365 | ||
@@ -413,7 +411,6 @@ static void x25_asy_connected(struct net_device *dev, int reason) | |||
413 | 411 | ||
414 | skb->protocol = x25_type_trans(skb, sl->dev); | 412 | skb->protocol = x25_type_trans(skb, sl->dev); |
415 | netif_rx(skb); | 413 | netif_rx(skb); |
416 | sl->dev->last_rx = jiffies; | ||
417 | } | 414 | } |
418 | 415 | ||
419 | static void x25_asy_disconnected(struct net_device *dev, int reason) | 416 | static void x25_asy_disconnected(struct net_device *dev, int reason) |
@@ -433,7 +430,6 @@ static void x25_asy_disconnected(struct net_device *dev, int reason) | |||
433 | 430 | ||
434 | skb->protocol = x25_type_trans(skb, sl->dev); | 431 | skb->protocol = x25_type_trans(skb, sl->dev); |
435 | netif_rx(skb); | 432 | netif_rx(skb); |
436 | sl->dev->last_rx = jiffies; | ||
437 | } | 433 | } |
438 | 434 | ||
439 | static struct lapb_register_struct x25_asy_callbacks = { | 435 | static struct lapb_register_struct x25_asy_callbacks = { |