Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zd1201: convert to internal net_device_stats

Browse source 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-03-20 19:36:31 +00:00 committed by David S. Miller
parent 85a151b760
commit 22bc1ce4f1
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/net/wireless/zd1201.c
View file

@ -328,8 +328,8 @@ static void zd1201_usbrx(struct urb *urb)
memcpy(skb_put(skb, 2), &data[datalen-24], 2); memcpy(skb_put(skb, 2), &data[datalen-24], 2);
memcpy(skb_put(skb, len), data, len); memcpy(skb_put(skb, len), data, len);
skb->protocol = eth_type_trans(skb, zd->dev); skb->protocol = eth_type_trans(skb, zd->dev);
zd->stats.rx_packets++; zd->dev->stats.rx_packets++;
zd->stats.rx_bytes += skb->len; zd->dev->stats.rx_bytes += skb->len;
netif_rx(skb); netif_rx(skb);
goto resubmit; goto resubmit;
} }
@ -384,8 +384,8 @@ static void zd1201_usbrx(struct urb *urb)
memcpy(skb_put(skb, len), data+8, len); memcpy(skb_put(skb, len), data+8, len);
} }
skb->protocol = eth_type_trans(skb, zd->dev); skb->protocol = eth_type_trans(skb, zd->dev);
zd->stats.rx_packets++; zd->dev->stats.rx_packets++;
zd->stats.rx_bytes += skb->len; zd->dev->stats.rx_bytes += skb->len;
netif_rx(skb); netif_rx(skb);
} }
resubmit: resubmit:
@ -787,7 +787,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct urb *urb = zd->tx_urb; struct urb *urb = zd->tx_urb;
if (!zd->mac_enabled || zd->monitor) { if (!zd->mac_enabled || zd->monitor) {
zd->stats.tx_dropped++; dev->stats.tx_dropped++;
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
} }
@ -817,12 +817,12 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
err = usb_submit_urb(zd->tx_urb, GFP_ATOMIC); err = usb_submit_urb(zd->tx_urb, GFP_ATOMIC);
if (err) { if (err) {
zd->stats.tx_errors++; dev->stats.tx_errors++;
netif_start_queue(dev); netif_start_queue(dev);
return err; return err;
} }
zd->stats.tx_packets++; dev->stats.tx_packets++;
zd->stats.tx_bytes += skb->len; dev->stats.tx_bytes += skb->len;
dev->trans_start = jiffies; dev->trans_start = jiffies;
kfree_skb(skb); kfree_skb(skb);
@ -838,7 +838,7 @@ static void zd1201_tx_timeout(struct net_device *dev)
dev_warn(&zd->usb->dev, "%s: TX timeout, shooting down urb\n", dev_warn(&zd->usb->dev, "%s: TX timeout, shooting down urb\n",
dev->name); dev->name);
usb_unlink_urb(zd->tx_urb); usb_unlink_urb(zd->tx_urb);
zd->stats.tx_errors++; dev->stats.tx_errors++;
/* Restart the timeout to quiet the watchdog: */ /* Restart the timeout to quiet the watchdog: */
dev->trans_start = jiffies; dev->trans_start = jiffies;
} }
@ -861,13 +861,6 @@ static int zd1201_set_mac_address(struct net_device *dev, void *p)
return zd1201_mac_reset(zd); return zd1201_mac_reset(zd);
} }
static struct net_device_stats *zd1201_get_stats(struct net_device *dev)
{
struct zd1201 *zd = netdev_priv(dev);
return &zd->stats;
}
static struct iw_statistics *zd1201_get_wireless_stats(struct net_device *dev) static struct iw_statistics *zd1201_get_wireless_stats(struct net_device *dev)
{ {
struct zd1201 *zd = netdev_priv(dev); struct zd1201 *zd = netdev_priv(dev);
@ -1778,9 +1771,7 @@ static int zd1201_probe(struct usb_interface *interface,
dev->open = zd1201_net_open; dev->open = zd1201_net_open;
dev->stop = zd1201_net_stop; dev->stop = zd1201_net_stop;
dev->get_stats = zd1201_get_stats; dev->wireless_handlers = &zd1201_iw_handlers;
dev->wireless_handlers =
(struct iw_handler_def *)&zd1201_iw_handlers;
dev->hard_start_xmit = zd1201_hard_start_xmit; dev->hard_start_xmit = zd1201_hard_start_xmit;
dev->watchdog_timeo = ZD1201_TX_TIMEOUT; dev->watchdog_timeo = ZD1201_TX_TIMEOUT;
dev->tx_timeout = zd1201_tx_timeout; dev->tx_timeout = zd1201_tx_timeout;

1
drivers/net/wireless/zd1201.h
View file

@ -26,7 +26,6 @@ struct zd1201 {
struct usb_device *usb; struct usb_device *usb;
int removed; int removed;
struct net_device *dev; struct net_device *dev;
struct net_device_stats stats;
struct iw_statistics iwstats; struct iw_statistics iwstats;
int endp_in; int endp_in;