diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:13:10 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:13:10 -0500 |
| commit | acfaf10be5c19f7dceb9d7372039dc45af66b100 (patch) | |
| tree | 75dce83cc4495a13056fde1c2166323e07373858 /net/ieee80211 | |
| parent | c45ae87ec9d03c9adfc466a6b560cb38b154813a (diff) | |
| parent | 4832843d773462643cc471ca715382f5e509afb3 (diff) | |
| download | linux-acfaf10be5c19f7dceb9d7372039dc45af66b100.tar.gz linux-acfaf10be5c19f7dceb9d7372039dc45af66b100.tar.bz2 linux-acfaf10be5c19f7dceb9d7372039dc45af66b100.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index fcf4382ef7d7..6b8469da29b1 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1394,7 +1394,7 @@ static void update_network(struct ieee80211_network *dst, /* 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); } @@ -1443,9 +1443,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device escape_essid(info_element->data, info_element->len), MAC_ARG(beacon->header.addr3), - is_beacon(le16_to_cpu - (beacon->header. - frame_ctl)) ? + is_beacon(beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE"); return; } @@ -1496,9 +1494,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device escape_essid(network.ssid, network.ssid_len), MAC_ARG(network.bssid), - is_beacon(le16_to_cpu - (beacon->header. - frame_ctl)) ? + is_beacon(beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE"); #endif memcpy(target, &network, sizeof(*target)); @@ -1509,9 +1505,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device escape_essid(target->ssid, target->ssid_len), MAC_ARG(target->bssid), - is_beacon(le16_to_cpu - (beacon->header. - frame_ctl)) ? + is_beacon(beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE"); update_network(target, &network); network.ibss_dfs = NULL; @@ -1519,7 +1513,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device 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) ieee->handle_beacon(dev, beacon, &network); } else { |