UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

airo: use netstats in net_device structure 

Use net_device_stats from net_device structure instead of local.
Changed airo_read_stats function parameter to net_device.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Paulius Zaleckas 2008-05-05 22:38:34 +03:00 committed by John W. Linville
parent 1b73af8284
commit 5d9276daa4
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/wireless/airo.c
View File

@ -1148,7 +1148,6 @@ static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm);
static void airo_networks_free(struct airo_info *ai); static void airo_networks_free(struct airo_info *ai);
struct airo_info { struct airo_info {
struct net_device_stats stats;
struct net_device *dev; struct net_device *dev;
struct list_head dev_list; struct list_head dev_list;
/* Note, we can have MAX_FIDS outstanding. FIDs are 16-bits, so we /* Note, we can have MAX_FIDS outstanding. FIDs are 16-bits, so we
@ -1924,7 +1923,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
if (npacks >= MAXTXQ - 1) { if (npacks >= MAXTXQ - 1) {
netif_stop_queue (dev); netif_stop_queue (dev);
if (npacks > MAXTXQ) { if (npacks > MAXTXQ) {
ai->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
return 1; return 1;
} }
skb_queue_tail (&ai->txq, skb); skb_queue_tail (&ai->txq, skb);
@ -2044,13 +2043,13 @@ static void get_tx_error(struct airo_info *ai, s32 fid)
bap_read(ai, &status, 2, BAP0); bap_read(ai, &status, 2, BAP0);
} }
if (le16_to_cpu(status) & 2) /* Too many retries */ if (le16_to_cpu(status) & 2) /* Too many retries */
ai->stats.tx_aborted_errors++; ai->dev->stats.tx_aborted_errors++;
if (le16_to_cpu(status) & 4) /* Transmit lifetime exceeded */ if (le16_to_cpu(status) & 4) /* Transmit lifetime exceeded */
ai->stats.tx_heartbeat_errors++; ai->dev->stats.tx_heartbeat_errors++;
if (le16_to_cpu(status) & 8) /* Aid fail */ if (le16_to_cpu(status) & 8) /* Aid fail */
{ } { }
if (le16_to_cpu(status) & 0x10) /* MAC disabled */ if (le16_to_cpu(status) & 0x10) /* MAC disabled */
ai->stats.tx_carrier_errors++; ai->dev->stats.tx_carrier_errors++;
if (le16_to_cpu(status) & 0x20) /* Association lost */ if (le16_to_cpu(status) & 0x20) /* Association lost */
{ } { }
/* We produce a TXDROP event only for retry or lifetime /* We produce a TXDROP event only for retry or lifetime
@ -2102,7 +2101,7 @@ static void airo_end_xmit(struct net_device *dev) {
for (; i < MAX_FIDS / 2 && (priv->fids[i] & 0xffff0000); i++); for (; i < MAX_FIDS / 2 && (priv->fids[i] & 0xffff0000); i++);
} else { } else {
priv->fids[fid] &= 0xffff; priv->fids[fid] &= 0xffff;
priv->stats.tx_window_errors++; dev->stats.tx_window_errors++;
} }
if (i < MAX_FIDS / 2) if (i < MAX_FIDS / 2)
netif_wake_queue(dev); netif_wake_queue(dev);
@ -2128,7 +2127,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
netif_stop_queue(dev); netif_stop_queue(dev);
if (i == MAX_FIDS / 2) { if (i == MAX_FIDS / 2) {
priv->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
return 1; return 1;
} }
} }
@ -2167,7 +2166,7 @@ static void airo_end_xmit11(struct net_device *dev) {
for (; i < MAX_FIDS && (priv->fids[i] & 0xffff0000); i++); for (; i < MAX_FIDS && (priv->fids[i] & 0xffff0000); i++);
} else { } else {
priv->fids[fid] &= 0xffff; priv->fids[fid] &= 0xffff;
priv->stats.tx_window_errors++; dev->stats.tx_window_errors++;
} }
if (i < MAX_FIDS) if (i < MAX_FIDS)
netif_wake_queue(dev); netif_wake_queue(dev);
@ -2199,7 +2198,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
netif_stop_queue(dev); netif_stop_queue(dev);
if (i == MAX_FIDS) { if (i == MAX_FIDS) {
priv->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
return 1; return 1;
} }
} }
@ -2219,8 +2218,9 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
return 0; return 0;
} }
static void airo_read_stats(struct airo_info *ai) static void airo_read_stats(struct net_device *dev)
{ {
struct airo_info *ai = dev->priv;
StatsRid stats_rid; StatsRid stats_rid;
__le32 *vals = stats_rid.vals; __le32 *vals = stats_rid.vals;
@ -2232,23 +2232,24 @@ static void airo_read_stats(struct airo_info *ai)
readStatsRid(ai, &stats_rid, RID_STATS, 0); readStatsRid(ai, &stats_rid, RID_STATS, 0);
up(&ai->sem); up(&ai->sem);
ai->stats.rx_packets = le32_to_cpu(vals[43]) + le32_to_cpu(vals[44]) + dev->stats.rx_packets = le32_to_cpu(vals[43]) + le32_to_cpu(vals[44]) +
le32_to_cpu(vals[45]); le32_to_cpu(vals[45]);
ai->stats.tx_packets = le32_to_cpu(vals[39]) + le32_to_cpu(vals[40]) + dev->stats.tx_packets = le32_to_cpu(vals[39]) + le32_to_cpu(vals[40]) +
le32_to_cpu(vals[41]); le32_to_cpu(vals[41]);
ai->stats.rx_bytes = le32_to_cpu(vals[92]); dev->stats.rx_bytes = le32_to_cpu(vals[92]);
ai->stats.tx_bytes = le32_to_cpu(vals[91]); dev->stats.tx_bytes = le32_to_cpu(vals[91]);
ai->stats.rx_errors = le32_to_cpu(vals[0]) + le32_to_cpu(vals[2]) + dev->stats.rx_errors = le32_to_cpu(vals[0]) + le32_to_cpu(vals[2]) +
le32_to_cpu(vals[3]) + le32_to_cpu(vals[4]); le32_to_cpu(vals[3]) + le32_to_cpu(vals[4]);
ai->stats.tx_errors = le32_to_cpu(vals[42]) + ai->stats.tx_fifo_errors; dev->stats.tx_errors = le32_to_cpu(vals[42]) +
ai->stats.multicast = le32_to_cpu(vals[43]); dev->stats.tx_fifo_errors;
ai->stats.collisions = le32_to_cpu(vals[89]); dev->stats.multicast = le32_to_cpu(vals[43]);
dev->stats.collisions = le32_to_cpu(vals[89]);
/* detailed rx_errors: */ /* detailed rx_errors: */
ai->stats.rx_length_errors = le32_to_cpu(vals[3]); dev->stats.rx_length_errors = le32_to_cpu(vals[3]);
ai->stats.rx_crc_errors = le32_to_cpu(vals[4]); dev->stats.rx_crc_errors = le32_to_cpu(vals[4]);
ai->stats.rx_frame_errors = le32_to_cpu(vals[2]); dev->stats.rx_frame_errors = le32_to_cpu(vals[2]);
ai->stats.rx_fifo_errors = le32_to_cpu(vals[0]); dev->stats.rx_fifo_errors = le32_to_cpu(vals[0]);
} }
static struct net_device_stats *airo_get_stats(struct net_device *dev) static struct net_device_stats *airo_get_stats(struct net_device *dev)
@ -2261,10 +2262,10 @@ static struct net_device_stats *airo_get_stats(struct net_device *dev)
set_bit(JOB_STATS, &local->jobs); set_bit(JOB_STATS, &local->jobs);
wake_up_interruptible(&local->thr_wait); wake_up_interruptible(&local->thr_wait);
} else } else
airo_read_stats(local); airo_read_stats(dev);
} }
return &local->stats; return &dev->stats;
} }
static void airo_set_promisc(struct airo_info *ai) { static void airo_set_promisc(struct airo_info *ai) {
@ -3092,7 +3093,7 @@ static int airo_thread(void *data) {
else if (test_bit(JOB_XMIT11, &ai->jobs)) else if (test_bit(JOB_XMIT11, &ai->jobs))
airo_end_xmit11(dev); airo_end_xmit11(dev);
else if (test_bit(JOB_STATS, &ai->jobs)) else if (test_bit(JOB_STATS, &ai->jobs))
airo_read_stats(ai); airo_read_stats(dev);
else if (test_bit(JOB_WSTATS, &ai->jobs)) else if (test_bit(JOB_WSTATS, &ai->jobs))
airo_read_wireless_stats(ai); airo_read_wireless_stats(ai);
else if (test_bit(JOB_PROMISC, &ai->jobs)) else if (test_bit(JOB_PROMISC, &ai->jobs))
@ -3288,7 +3289,7 @@ static irqreturn_t airo_interrupt(int irq, void *dev_id)
skb = dev_alloc_skb( len + hdrlen + 2 + 2 ); skb = dev_alloc_skb( len + hdrlen + 2 + 2 );
if ( !skb ) { if ( !skb ) {
apriv->stats.rx_dropped++; dev->stats.rx_dropped++;
goto badrx; goto badrx;
} }
skb_reserve(skb, 2); /* This way the IP header is aligned */ skb_reserve(skb, 2); /* This way the IP header is aligned */
@ -3556,7 +3557,7 @@ static void mpi_receive_802_3(struct airo_info *ai)
skb = dev_alloc_skb(len); skb = dev_alloc_skb(len);
if (!skb) { if (!skb) {
ai->stats.rx_dropped++; ai->dev->stats.rx_dropped++;
goto badrx; goto badrx;
} }
buffer = skb_put(skb,len); buffer = skb_put(skb,len);
@ -3649,7 +3650,7 @@ void mpi_receive_802_11 (struct airo_info *ai)
skb = dev_alloc_skb( len + hdrlen + 2 ); skb = dev_alloc_skb( len + hdrlen + 2 );
if ( !skb ) { if ( !skb ) {
ai->stats.rx_dropped++; ai->dev->stats.rx_dropped++;
goto badrx; goto badrx;
} }
buffer = (u16*)skb_put (skb, len + hdrlen); buffer = (u16*)skb_put (skb, len + hdrlen);