aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/rx.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-03-20 15:36:36 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-22 01:51:24 -0400
commitbbfc6b788f63f079fb8eeeb8d397bb1c0a8065a1 (patch)
tree65b339dc8a068e21495575a5629f7346213e2306 /drivers/net/wireless/libertas/rx.c
parent6456fffb09a281af2644e73fda26d1eeec325830 (diff)
libertas: convert to internal net_device_stats
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/libertas/rx.c')
-rw-r--r--drivers/net/wireless/libertas/rx.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 079e6aa874d..4f60948dde9 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -168,7 +168,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
168 168
169 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) { 169 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {
170 lbs_deb_rx("rx err: frame received with bad length\n"); 170 lbs_deb_rx("rx err: frame received with bad length\n");
171 priv->stats.rx_length_errors++; 171 dev->stats.rx_length_errors++;
172 ret = 0; 172 ret = 0;
173 goto done; 173 goto done;
174 } 174 }
@@ -179,7 +179,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
179 if (!(p_rx_pd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) { 179 if (!(p_rx_pd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) {
180 lbs_deb_rx("rx err: frame received with bad status\n"); 180 lbs_deb_rx("rx err: frame received with bad status\n");
181 lbs_pr_alert("rxpd not ok\n"); 181 lbs_pr_alert("rxpd not ok\n");
182 priv->stats.rx_errors++; 182 dev->stats.rx_errors++;
183 ret = 0; 183 ret = 0;
184 goto done; 184 goto done;
185 } 185 }
@@ -243,8 +243,8 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
243 lbs_compute_rssi(priv, p_rx_pd); 243 lbs_compute_rssi(priv, p_rx_pd);
244 244
245 lbs_deb_rx("rx data: size of actual packet %d\n", skb->len); 245 lbs_deb_rx("rx data: size of actual packet %d\n", skb->len);
246 priv->stats.rx_bytes += skb->len; 246 dev->stats.rx_bytes += skb->len;
247 priv->stats.rx_packets++; 247 dev->stats.rx_packets++;
248 248
249 skb->protocol = eth_type_trans(skb, dev); 249 skb->protocol = eth_type_trans(skb, dev);
250 if (in_interrupt()) 250 if (in_interrupt())
@@ -311,7 +311,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
311 struct sk_buff *skb) 311 struct sk_buff *skb)
312{ 312{
313 int ret = 0; 313 int ret = 0;
314 314 struct net_device *dev = priv->dev;
315 struct rx80211packethdr *p_rx_pkt; 315 struct rx80211packethdr *p_rx_pkt;
316 struct rxpd *prxpd; 316 struct rxpd *prxpd;
317 struct rx_radiotap_hdr radiotap_hdr; 317 struct rx_radiotap_hdr radiotap_hdr;
@@ -326,7 +326,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
326 326
327 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) { 327 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {
328 lbs_deb_rx("rx err: frame received with bad length\n"); 328 lbs_deb_rx("rx err: frame received with bad length\n");
329 priv->stats.rx_length_errors++; 329 dev->stats.rx_length_errors++;
330 ret = -EINVAL; 330 ret = -EINVAL;
331 kfree_skb(skb); 331 kfree_skb(skb);
332 goto done; 332 goto done;
@@ -337,7 +337,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
337 */ 337 */
338 if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) { 338 if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) {
339 //lbs_deb_rx("rx err: frame received with bad status\n"); 339 //lbs_deb_rx("rx err: frame received with bad status\n");
340 priv->stats.rx_errors++; 340 dev->stats.rx_errors++;
341 } 341 }
342 342
343 lbs_deb_rx("rx data: skb->len-sizeof(RxPd) = %d-%zd = %zd\n", 343 lbs_deb_rx("rx data: skb->len-sizeof(RxPd) = %d-%zd = %zd\n",
@@ -389,8 +389,8 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
389 lbs_compute_rssi(priv, prxpd); 389 lbs_compute_rssi(priv, prxpd);
390 390
391 lbs_deb_rx("rx data: size of actual packet %d\n", skb->len); 391 lbs_deb_rx("rx data: size of actual packet %d\n", skb->len);
392 priv->stats.rx_bytes += skb->len; 392 dev->stats.rx_bytes += skb->len;
393 priv->stats.rx_packets++; 393 dev->stats.rx_packets++;
394 394
395 skb->protocol = eth_type_trans(skb, priv->rtap_net_dev); 395 skb->protocol = eth_type_trans(skb, priv->rtap_net_dev);
396 netif_rx(skb); 396 netif_rx(skb);