git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
ieee80211
/
ieee80211_rx.c
diff --git
a/net/ieee80211/ieee80211_rx.c
b/net/ieee80211/ieee80211_rx.c
index
72d4d4e
..
604b7b0
100644
(file)
--- a/
net/ieee80211/ieee80211_rx.c
+++ b/
net/ieee80211/ieee80211_rx.c
@@
-14,6
+14,7
@@
*/
#include <linux/compiler.h>
*/
#include <linux/compiler.h>
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/if_arp.h>
#include <linux/in6.h>
#include <linux/errno.h>
#include <linux/if_arp.h>
#include <linux/in6.h>
@@
-404,9
+405,9
@@
int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
#endif
if (ieee->iw_mode == IW_MODE_MONITOR) {
#endif
if (ieee->iw_mode == IW_MODE_MONITOR) {
+ ieee80211_monitor_rx(ieee, skb, rx_stats);
stats->rx_packets++;
stats->rx_bytes += skb->len;
stats->rx_packets++;
stats->rx_bytes += skb->len;
- ieee80211_monitor_rx(ieee, skb, rx_stats);
return 1;
}
return 1;
}
@@
-1691,8
+1692,8
@@
void ieee80211_rx_mgt(struct ieee80211_device *ieee,
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
- IEEE80211_
DEBUG_MGMT
("%s: IEEE80211_REASSOC_REQ received\n",
-
ieee->dev->name);
+ IEEE80211_
WARNING
("%s: IEEE80211_REASSOC_REQ received\n",
+ ieee->dev->name);
if (ieee->handle_reassoc_request != NULL)
ieee->handle_reassoc_request(ieee->dev,
(struct ieee80211_reassoc_request *)
if (ieee->handle_reassoc_request != NULL)
ieee->handle_reassoc_request(ieee->dev,
(struct ieee80211_reassoc_request *)
@@
-1704,8
+1705,8
@@
void ieee80211_rx_mgt(struct ieee80211_device *ieee,
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
- IEEE80211_
DEBUG_MGMT
("%s: IEEE80211_ASSOC_REQ received\n",
-
ieee->dev->name);
+ IEEE80211_
WARNING
("%s: IEEE80211_ASSOC_REQ received\n",
+ ieee->dev->name);
if (ieee->handle_assoc_request != NULL)
ieee->handle_assoc_request(ieee->dev);
break;
if (ieee->handle_assoc_request != NULL)
ieee->handle_assoc_request(ieee->dev);
break;
@@
-1721,10
+1722,10
@@
void ieee80211_rx_mgt(struct ieee80211_device *ieee,
IEEE80211_DEBUG_MGMT("received UNKNOWN (%d)\n",
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
IEEE80211_DEBUG_MGMT("received UNKNOWN (%d)\n",
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
- IEEE80211_
DEBUG_MGMT
("%s: Unknown management packet: %d\n",
-
ieee->dev->name,
-
WLAN_FC_GET_STYPE(le16_to_cpu
-
(header->frame_ctl)));
+ IEEE80211_
WARNING
("%s: Unknown management packet: %d\n",
+ ieee->dev->name,
+ WLAN_FC_GET_STYPE(le16_to_cpu
+ (header->frame_ctl)));
break;
}
}
break;
}
}