From: Jouni Malinen <jkmaline@cc.hut.fi>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@oss.sgi.com
Subject: [PATCH wireless-2.6 2/12] Host AP: Fix interface packet counters
Date: Sun, 7 Nov 2004 23:11:32 -0800 [thread overview]
Message-ID: <20041108071132.GC1076@jm.kir.nu> (raw)
In-Reply-To: <20041108070156.GA1076@jm.kir.nu>
Fix wlan#/wifi# interface packet counters (both are supposed to see
data packets once; wlan# was counting TX twice and wifi# did not count
TX or RX at all for most cases).
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
diff -Nru a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c 2004-11-07 22:37:59 -08:00
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c 2004-11-07 22:37:59 -08:00
@@ -689,6 +689,9 @@
void *sta = NULL;
int keyidx = 0;
+ iface->stats.rx_packets++;
+ iface->stats.rx_bytes += skb->len;
+
/* dev is the master radio device; change this to be the default
* virtual interface (this may be changed to WDS device below) */
dev = local->ddev;
diff -Nru a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c 2004-11-07 22:37:59 -08:00
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c 2004-11-07 22:37:59 -08:00
@@ -379,7 +379,7 @@
printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
"(len=%d)\n", dev->name, skb->len);
ret = 0;
- meta->iface->stats.tx_dropped++;
+ iface->stats.tx_dropped++;
goto fail;
}
@@ -405,13 +405,13 @@
hostap_dump_tx_80211(dev->name, skb);
ret = 0; /* drop packet */
- meta->iface->stats.tx_dropped++;
+ iface->stats.tx_dropped++;
goto fail;
}
break;
case AP_TX_DROP:
ret = 0; /* drop packet */
- meta->iface->stats.tx_dropped++;
+ iface->stats.tx_dropped++;
goto fail;
case AP_TX_RETRY:
goto fail;
@@ -488,11 +488,11 @@
if (local->func->tx == NULL || local->func->tx(skb, dev)) {
ret = 0;
- meta->iface->stats.tx_dropped++;
+ iface->stats.tx_dropped++;
} else {
ret = 0;
- meta->iface->stats.tx_packets++;
- meta->iface->stats.tx_bytes += skb->len;
+ iface->stats.tx_packets++;
+ iface->stats.tx_bytes += skb->len;
}
fail:
--
Jouni Malinen PGP id EFC895FA
next prev parent reply other threads:[~2004-11-08 7:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-08 7:01 [PATCH wireless-2.6 0/12] Host AP update Jouni Malinen
2004-11-08 7:10 ` [PATCH wireless-2.6 1/12] Host AP: Disable EAPOL TX/RX debug messages Jouni Malinen
2004-11-09 7:40 ` Jeff Garzik
2004-11-08 7:11 ` Jouni Malinen [this message]
2004-11-08 7:12 ` [PATCH wireless-2.6 3/12] Host AP: Ignore (Re)AssocResp messages silently Jouni Malinen
2004-11-08 7:12 ` [PATCH wireless-2.6 4/12] Host AP: Remove ioctl debug messages Jouni Malinen
2004-11-08 7:13 ` [PATCH wireless-2.6 5/12] Host AP: Fix hw address changing for wifi# interface Jouni Malinen
2004-11-08 7:13 ` [PATCH wireless-2.6 6/12] Host AP: Prevent STAs from associating using AP address Jouni Malinen
2004-11-08 7:14 ` [PATCH wireless-2.6 7/12] Host AP: Fix compilation with PRISM2_NO_STATION_MODES defined Jouni Malinen
2004-11-08 7:14 ` [PATCH wireless-2.6 8/12] Host AP: Do not bridge packets to unauthorized ports Jouni Malinen
2004-11-08 7:15 ` [PATCH wireless-2.6 9/12] Host AP: Fix card enabling after firmware download Jouni Malinen
2004-11-08 7:16 ` [PATCH wireless-2.6 10/12] Host AP: Use void * instead of unsigned long with {read,write}{b,w} Jouni Malinen
2004-11-09 7:29 ` Jeff Garzik
2004-11-14 5:18 ` [PATCH wireless-2.6 10/16] Host AP: Use void __iomem * " Jouni Malinen
2004-11-14 23:49 ` Jeff Garzik
2004-11-08 7:17 ` [PATCH wireless-2.6 11/12] Host AP: Fix PRISM2_IO_DEBUG Jouni Malinen
2004-11-09 7:29 ` Jeff Garzik
2004-11-14 5:20 ` [PATCH wireless-2.6 11/16] " Jouni Malinen
2004-11-08 7:17 ` [PATCH wireless-2.6 12/12] Host AP: Fix netif_carrier_off() in non-client modes Jouni Malinen
2004-11-09 8:04 ` [PATCH wireless-2.6 0/12] Host AP update Jeff Garzik
2004-11-09 9:09 ` Michael Renzmann
2004-11-09 15:26 ` Jeff Garzik
2004-11-09 21:32 ` Vladimir Kondratiev
2004-11-14 5:15 ` Jouni Malinen
2004-11-14 5:21 ` [PATCH wireless-2.6 12/16] Host AP: Fix netif_carrier_off() in non-client modes Jouni Malinen
2004-11-14 5:22 ` [PATCH wireless-2.6 13/16] Host AP: pci_register_driver() return value changes Jouni Malinen
2004-11-14 5:23 ` [PATCH wireless-2.6 14/16] Host AP: Updated to use Linux wireless extensions v17 Jouni Malinen
2004-11-14 5:24 ` [PATCH wireless-2.6 15/16] Host AP: Replaced direct dev->priv references with netdev_priv(dev) Jouni Malinen
2004-11-14 5:25 ` [PATCH wireless-2.6 16/16] Host AP: Replaced MODULE_PARM with module_param* Jouni Malinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041108071132.GC1076@jm.kir.nu \
--to=jkmaline@cc.hut.fi \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).