Commit c2b8047a authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: collect_bss_info23a(): ieee80211_mgmt capab_info is little endian

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b124b1a
...@@ -4546,7 +4546,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter, ...@@ -4546,7 +4546,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter,
if (ieee80211_is_beacon(mgmt->frame_control)) { if (ieee80211_is_beacon(mgmt->frame_control)) {
bssid->reserved = 1; bssid->reserved = 1;
ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable); ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);
capab_info = mgmt->u.beacon.capab_info; capab_info = get_unaligned_le16(&mgmt->u.beacon.capab_info);
bssid->BeaconPeriod = bssid->BeaconPeriod =
get_unaligned_le16(&mgmt->u.beacon.beacon_int); get_unaligned_le16(&mgmt->u.beacon.beacon_int);
} else if (ieee80211_is_probe_req(mgmt->frame_control)) { } else if (ieee80211_is_probe_req(mgmt->frame_control)) {
...@@ -4560,13 +4560,13 @@ int collect_bss_info23a(struct rtw_adapter *padapter, ...@@ -4560,13 +4560,13 @@ int collect_bss_info23a(struct rtw_adapter *padapter,
ie_offset = offsetof(struct ieee80211_mgmt, ie_offset = offsetof(struct ieee80211_mgmt,
u.probe_resp.variable); u.probe_resp.variable);
bssid->reserved = 3; bssid->reserved = 3;
capab_info = mgmt->u.probe_resp.capab_info; capab_info = get_unaligned_le16(&mgmt->u.probe_resp.capab_info);
bssid->BeaconPeriod = bssid->BeaconPeriod =
get_unaligned_le16(&mgmt->u.probe_resp.beacon_int); get_unaligned_le16(&mgmt->u.probe_resp.beacon_int);
} else { } else {
bssid->reserved = 0; bssid->reserved = 0;
ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable); ie_offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);
capab_info = mgmt->u.beacon.capab_info; capab_info = get_unaligned_le16(&mgmt->u.beacon.capab_info);
bssid->BeaconPeriod = bssid->BeaconPeriod =
padapter->registrypriv.dev_network.BeaconPeriod; padapter->registrypriv.dev_network.BeaconPeriod;
} }
...@@ -4662,7 +4662,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter, ...@@ -4662,7 +4662,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter,
return _SUCCESS; return _SUCCESS;
} }
if (capab_info & BIT(0)) { if (capab_info & WLAN_CAPABILITY_ESS) {
bssid->ifmode = NL80211_IFTYPE_STATION; bssid->ifmode = NL80211_IFTYPE_STATION;
ether_addr_copy(bssid->MacAddress, mgmt->sa); ether_addr_copy(bssid->MacAddress, mgmt->sa);
} else { } else {
...@@ -4670,7 +4670,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter, ...@@ -4670,7 +4670,7 @@ int collect_bss_info23a(struct rtw_adapter *padapter,
ether_addr_copy(bssid->MacAddress, mgmt->bssid); ether_addr_copy(bssid->MacAddress, mgmt->bssid);
} }
if (capab_info & BIT(4)) if (capab_info & WLAN_CAPABILITY_PRIVACY)
bssid->Privacy = 1; bssid->Privacy = 1;
else else
bssid->Privacy = 0; bssid->Privacy = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment