summaryrefslogtreecommitdiffstats
path: root/net/ieee80211
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-07 22:54:48 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-07 22:54:48 -0500
commit3133c5e896c0b2509e72ae0c2cb9452c80d47f46 (patch)
treeae8af7e85d0a7c402cca7d31eac2935897e1d698 /net/ieee80211
parent6b995751c2e851d2bc9c277b5884d0adb519e31d (diff)
parentb69a3aa85cb7bda2eb6c5932a62c1337d0d6612c (diff)
downloadlinux-3133c5e896c0b2509e72ae0c2cb9452c80d47f46.tar.bz2
Merge git://git.tuxdriver.com/git/netdev-jwl
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/ieee80211_rx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 6ad88218f573..03efaacbdb73 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -369,6 +369,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
/* Put this code here so that we avoid duplicating it in all
* Rx paths. - Jean II */
#ifdef IW_WIRELESS_SPY /* defined in iw_handler.h */
+#ifdef CONFIG_NET_RADIO
/* If spy monitoring on */
if (ieee->spy_data.spy_number > 0) {
struct iw_quality wstats;
@@ -395,6 +396,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
/* Update spy records */
wireless_spy_update(ieee->dev, hdr->addr2, &wstats);
}
+#endif /* CONFIG_NET_RADIO */
#endif /* IW_WIRELESS_SPY */
#ifdef NOT_YET