redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse source
This commit is contained in:
Jeff Garzik 2006-02-28 18:04:30 -05:00
parent 816fd40471 4832843d77
commit ce7eeb6b52
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/ieee80211/ieee80211_rx.c
View file

@ -1301,7 +1301,7 @@ static void update_network(struct ieee80211_network *dst,
/* dst->last_associate is not overwritten */ /* dst->last_associate is not overwritten */
} }
static inline int is_beacon(int fc) static inline int is_beacon(__le16 fc)
{ {
return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON);
} }
@ -1348,9 +1348,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
escape_essid(info_element->data, escape_essid(info_element->data,
info_element->len), info_element->len),
MAC_ARG(beacon->header.addr3), MAC_ARG(beacon->header.addr3),
is_beacon(le16_to_cpu is_beacon(beacon->header.frame_ctl) ?
(beacon->header.
frame_ctl)) ?
"BEACON" : "PROBE RESPONSE"); "BEACON" : "PROBE RESPONSE");
return; return;
} }
@ -1400,9 +1398,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
escape_essid(network.ssid, escape_essid(network.ssid,
network.ssid_len), network.ssid_len),
MAC_ARG(network.bssid), MAC_ARG(network.bssid),
is_beacon(le16_to_cpu is_beacon(beacon->header.frame_ctl) ?
(beacon->header.
frame_ctl)) ?
"BEACON" : "PROBE RESPONSE"); "BEACON" : "PROBE RESPONSE");
#endif #endif
memcpy(target, &network, sizeof(*target)); memcpy(target, &network, sizeof(*target));
@ -1412,16 +1408,14 @@ static void ieee80211_process_probe_response(struct ieee80211_device
escape_essid(target->ssid, escape_essid(target->ssid,
target->ssid_len), target->ssid_len),
MAC_ARG(target->bssid), MAC_ARG(target->bssid),
is_beacon(le16_to_cpu is_beacon(beacon->header.frame_ctl) ?
(beacon->header.
frame_ctl)) ?
"BEACON" : "PROBE RESPONSE"); "BEACON" : "PROBE RESPONSE");
update_network(target, &network); update_network(target, &network);
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
if (is_beacon(le16_to_cpu(beacon->header.frame_ctl))) { if (is_beacon(beacon->header.frame_ctl)) {
if (ieee->handle_beacon != NULL) if (ieee->handle_beacon != NULL)
ieee->handle_beacon(dev, beacon, &network); ieee->handle_beacon(dev, beacon, &network);
} else { } else {