diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/airo.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/arlan-main.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/atmel.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_80211_rx.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/strip.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/zd1201.c | 2 |
12 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index d7388d2aee97..c8dc6568cec9 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -3366,7 +3366,6 @@ badrx: | |||
3366 | skb->protocol = htons(ETH_P_802_2); | 3366 | skb->protocol = htons(ETH_P_802_2); |
3367 | } else | 3367 | } else |
3368 | skb->protocol = eth_type_trans(skb,dev); | 3368 | skb->protocol = eth_type_trans(skb,dev); |
3369 | skb->dev->last_rx = jiffies; | ||
3370 | skb->ip_summed = CHECKSUM_NONE; | 3369 | skb->ip_summed = CHECKSUM_NONE; |
3371 | 3370 | ||
3372 | netif_rx( skb ); | 3371 | netif_rx( skb ); |
@@ -3596,7 +3595,6 @@ badmic: | |||
3596 | 3595 | ||
3597 | skb->ip_summed = CHECKSUM_NONE; | 3596 | skb->ip_summed = CHECKSUM_NONE; |
3598 | skb->protocol = eth_type_trans(skb, ai->dev); | 3597 | skb->protocol = eth_type_trans(skb, ai->dev); |
3599 | skb->dev->last_rx = jiffies; | ||
3600 | netif_rx(skb); | 3598 | netif_rx(skb); |
3601 | } | 3599 | } |
3602 | badrx: | 3600 | badrx: |
@@ -3690,7 +3688,6 @@ void mpi_receive_802_11 (struct airo_info *ai) | |||
3690 | skb->pkt_type = PACKET_OTHERHOST; | 3688 | skb->pkt_type = PACKET_OTHERHOST; |
3691 | skb->dev = ai->wifidev; | 3689 | skb->dev = ai->wifidev; |
3692 | skb->protocol = htons(ETH_P_802_2); | 3690 | skb->protocol = htons(ETH_P_802_2); |
3693 | skb->dev->last_rx = jiffies; | ||
3694 | skb->ip_summed = CHECKSUM_NONE; | 3691 | skb->ip_summed = CHECKSUM_NONE; |
3695 | netif_rx( skb ); | 3692 | netif_rx( skb ); |
3696 | badrx: | 3693 | badrx: |
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index b608643d5fcc..bfca15da6f0f 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
@@ -1529,7 +1529,6 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short | |||
1529 | printk(KERN_WARNING "arlan kernel pkt type trans %x \n", skb->protocol); | 1529 | printk(KERN_WARNING "arlan kernel pkt type trans %x \n", skb->protocol); |
1530 | } | 1530 | } |
1531 | netif_rx(skb); | 1531 | netif_rx(skb); |
1532 | dev->last_rx = jiffies; | ||
1533 | dev->stats.rx_packets++; | 1532 | dev->stats.rx_packets++; |
1534 | dev->stats.rx_bytes += pkt_len; | 1533 | dev->stats.rx_bytes += pkt_len; |
1535 | } | 1534 | } |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 6e20552c1881..d16931589f81 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -919,7 +919,6 @@ static void fast_rx_path(struct atmel_private *priv, | |||
919 | else | 919 | else |
920 | memcpy(&skbp[6], header->addr2, 6); /* source address */ | 920 | memcpy(&skbp[6], header->addr2, 6); /* source address */ |
921 | 921 | ||
922 | priv->dev->last_rx = jiffies; | ||
923 | skb->protocol = eth_type_trans(skb, priv->dev); | 922 | skb->protocol = eth_type_trans(skb, priv->dev); |
924 | skb->ip_summed = CHECKSUM_NONE; | 923 | skb->ip_summed = CHECKSUM_NONE; |
925 | netif_rx(skb); | 924 | netif_rx(skb); |
@@ -1026,7 +1025,6 @@ static void frag_rx_path(struct atmel_private *priv, | |||
1026 | memcpy(skb_put(skb, priv->frag_len + 12), | 1025 | memcpy(skb_put(skb, priv->frag_len + 12), |
1027 | priv->rx_buf, | 1026 | priv->rx_buf, |
1028 | priv->frag_len + 12); | 1027 | priv->frag_len + 12); |
1029 | priv->dev->last_rx = jiffies; | ||
1030 | skb->protocol = eth_type_trans(skb, priv->dev); | 1028 | skb->protocol = eth_type_trans(skb, priv->dev); |
1031 | skb->ip_summed = CHECKSUM_NONE; | 1029 | skb->ip_summed = CHECKSUM_NONE; |
1032 | netif_rx(skb); | 1030 | netif_rx(skb); |
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index bbb8ec6683d7..5f64461aa54e 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
@@ -67,7 +67,6 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb, | |||
67 | 67 | ||
68 | iface = netdev_priv(dev); | 68 | iface = netdev_priv(dev); |
69 | local = iface->local; | 69 | local = iface->local; |
70 | dev->last_rx = jiffies; | ||
71 | 70 | ||
72 | if (dev->type == ARPHRD_IEEE80211_PRISM) { | 71 | if (dev->type == ARPHRD_IEEE80211_PRISM) { |
73 | if (local->monitor_type == PRISM2_MONITOR_PRISM) { | 72 | if (local->monitor_type == PRISM2_MONITOR_PRISM) { |
@@ -883,8 +882,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
883 | from_assoc_ap = 1; | 882 | from_assoc_ap = 1; |
884 | } | 883 | } |
885 | 884 | ||
886 | dev->last_rx = jiffies; | ||
887 | |||
888 | if ((local->iw_mode == IW_MODE_MASTER || | 885 | if ((local->iw_mode == IW_MODE_MASTER || |
889 | local->iw_mode == IW_MODE_REPEAT) && | 886 | local->iw_mode == IW_MODE_REPEAT) && |
890 | !from_assoc_ap) { | 887 | !from_assoc_ap) { |
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index be80c0093b79..24caec6caf1f 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -1307,7 +1307,6 @@ static int netwave_rx(struct net_device *dev) | |||
1307 | /* Queue packet for network layer */ | 1307 | /* Queue packet for network layer */ |
1308 | netif_rx(skb); | 1308 | netif_rx(skb); |
1309 | 1309 | ||
1310 | dev->last_rx = jiffies; | ||
1311 | priv->stats.rx_packets++; | 1310 | priv->stats.rx_packets++; |
1312 | priv->stats.rx_bytes += rcvLen; | 1311 | priv->stats.rx_bytes += rcvLen; |
1313 | 1312 | ||
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 5a39166e2a0f..b657a916b1d7 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -1289,7 +1289,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid, | |||
1289 | skb->pkt_type = PACKET_OTHERHOST; | 1289 | skb->pkt_type = PACKET_OTHERHOST; |
1290 | skb->protocol = __constant_htons(ETH_P_802_2); | 1290 | skb->protocol = __constant_htons(ETH_P_802_2); |
1291 | 1291 | ||
1292 | dev->last_rx = jiffies; | ||
1293 | stats->rx_packets++; | 1292 | stats->rx_packets++; |
1294 | stats->rx_bytes += skb->len; | 1293 | stats->rx_bytes += skb->len; |
1295 | 1294 | ||
@@ -1538,7 +1537,6 @@ static void orinoco_rx(struct net_device *dev, | |||
1538 | else | 1537 | else |
1539 | memcpy(hdr->h_source, desc->addr2, ETH_ALEN); | 1538 | memcpy(hdr->h_source, desc->addr2, ETH_ALEN); |
1540 | 1539 | ||
1541 | dev->last_rx = jiffies; | ||
1542 | skb->protocol = eth_type_trans(skb, dev); | 1540 | skb->protocol = eth_type_trans(skb, dev); |
1543 | skb->ip_summed = CHECKSUM_NONE; | 1541 | skb->ip_summed = CHECKSUM_NONE; |
1544 | if (fc & IEEE80211_FCTL_TODS) | 1542 | if (fc & IEEE80211_FCTL_TODS) |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index bf0b9299b5df..81b71f07f5ad 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -2284,7 +2284,6 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, unsigned i | |||
2284 | 2284 | ||
2285 | skb->protocol = eth_type_trans(skb,dev); | 2285 | skb->protocol = eth_type_trans(skb,dev); |
2286 | netif_rx(skb); | 2286 | netif_rx(skb); |
2287 | dev->last_rx = jiffies; | ||
2288 | local->stats.rx_packets++; | 2287 | local->stats.rx_packets++; |
2289 | local->stats.rx_bytes += total_len; | 2288 | local->stats.rx_bytes += total_len; |
2290 | 2289 | ||
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 417e9e675fac..cf0d070ced13 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -1997,7 +1997,6 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header * header, | |||
1997 | #ifdef EXT_COUNTERS | 1997 | #ifdef EXT_COUNTERS |
1998 | strip_info->rx_bytes += packetlen; | 1998 | strip_info->rx_bytes += packetlen; |
1999 | #endif | 1999 | #endif |
2000 | skb->dev->last_rx = jiffies; | ||
2001 | netif_rx(skb); | 2000 | netif_rx(skb); |
2002 | } | 2001 | } |
2003 | } | 2002 | } |
@@ -2490,7 +2489,6 @@ static void strip_dev_setup(struct net_device *dev) | |||
2490 | */ | 2489 | */ |
2491 | 2490 | ||
2492 | dev->trans_start = 0; | 2491 | dev->trans_start = 0; |
2493 | dev->last_rx = 0; | ||
2494 | dev->tx_queue_len = 30; /* Drop after 30 frames queued */ | 2492 | dev->tx_queue_len = 30; /* Drop after 30 frames queued */ |
2495 | 2493 | ||
2496 | dev->flags = 0; | 2494 | dev->flags = 0; |
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index 6fa3d792ae27..1ac37e86b9bd 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c | |||
@@ -2528,7 +2528,6 @@ wv_packet_read(struct net_device * dev, u16 buf_off, int sksize) | |||
2528 | netif_rx(skb); | 2528 | netif_rx(skb); |
2529 | 2529 | ||
2530 | /* Keep statistics up to date */ | 2530 | /* Keep statistics up to date */ |
2531 | dev->last_rx = jiffies; | ||
2532 | lp->stats.rx_packets++; | 2531 | lp->stats.rx_packets++; |
2533 | lp->stats.rx_bytes += sksize; | 2532 | lp->stats.rx_bytes += sksize; |
2534 | 2533 | ||
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 0a3bacc20d96..de717f8ffd61 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -2878,7 +2878,6 @@ wv_packet_read(struct net_device * dev, | |||
2878 | netif_rx(skb); | 2878 | netif_rx(skb); |
2879 | 2879 | ||
2880 | /* Keep stats up to date */ | 2880 | /* Keep stats up to date */ |
2881 | dev->last_rx = jiffies; | ||
2882 | lp->stats.rx_packets++; | 2881 | lp->stats.rx_packets++; |
2883 | lp->stats.rx_bytes += sksize; | 2882 | lp->stats.rx_bytes += sksize; |
2884 | 2883 | ||
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 8b96f50d9c6f..c99a1b6b948f 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1013,7 +1013,6 @@ static inline void wl3501_md_ind_interrupt(struct net_device *dev, | |||
1013 | wl3501_receive(this, skb->data, pkt_len); | 1013 | wl3501_receive(this, skb->data, pkt_len); |
1014 | skb_put(skb, pkt_len); | 1014 | skb_put(skb, pkt_len); |
1015 | skb->protocol = eth_type_trans(skb, dev); | 1015 | skb->protocol = eth_type_trans(skb, dev); |
1016 | dev->last_rx = jiffies; | ||
1017 | this->stats.rx_packets++; | 1016 | this->stats.rx_packets++; |
1018 | this->stats.rx_bytes += skb->len; | 1017 | this->stats.rx_bytes += skb->len; |
1019 | netif_rx(skb); | 1018 | netif_rx(skb); |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index b16ec6e5f0e3..bf744c1f5b23 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -328,7 +328,6 @@ static void zd1201_usbrx(struct urb *urb) | |||
328 | memcpy(skb_put(skb, 2), &data[datalen-24], 2); | 328 | memcpy(skb_put(skb, 2), &data[datalen-24], 2); |
329 | memcpy(skb_put(skb, len), data, len); | 329 | memcpy(skb_put(skb, len), data, len); |
330 | skb->protocol = eth_type_trans(skb, zd->dev); | 330 | skb->protocol = eth_type_trans(skb, zd->dev); |
331 | skb->dev->last_rx = jiffies; | ||
332 | zd->stats.rx_packets++; | 331 | zd->stats.rx_packets++; |
333 | zd->stats.rx_bytes += skb->len; | 332 | zd->stats.rx_bytes += skb->len; |
334 | netif_rx(skb); | 333 | netif_rx(skb); |
@@ -385,7 +384,6 @@ static void zd1201_usbrx(struct urb *urb) | |||
385 | memcpy(skb_put(skb, len), data+8, len); | 384 | memcpy(skb_put(skb, len), data+8, len); |
386 | } | 385 | } |
387 | skb->protocol = eth_type_trans(skb, zd->dev); | 386 | skb->protocol = eth_type_trans(skb, zd->dev); |
388 | skb->dev->last_rx = jiffies; | ||
389 | zd->stats.rx_packets++; | 387 | zd->stats.rx_packets++; |
390 | zd->stats.rx_bytes += skb->len; | 388 | zd->stats.rx_bytes += skb->len; |
391 | netif_rx(skb); | 389 | netif_rx(skb); |