Commit d7cfe7c8 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Make sparse happy - make rtw_get_beacon_interval23a_from_ie return __le16 *

parent 507a755d
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
	u8 *pHT_caps_ie = NULL;
	u8 *pHT_info_ie = NULL;
	struct sta_info *psta = NULL;
	__le16 *pbeacon;
	u16 cap, ht_cap = false;
	uint ie_len = 0;
	int group_cipher, pairwise_cipher;
@@ -838,8 +839,8 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,

	/* beacon interval */
	/* ie + 8;  8: TimeStamp, 2: Beacon Interval 2:Capability */
	p = rtw_get_beacon_interval23a_from_ie(ie);
	pbss_network->Configuration.BeaconPeriod = get_unaligned_le16(p);
	pbeacon = rtw_get_beacon_interval23a_from_ie(ie);
	pbss_network->Configuration.BeaconPeriod = get_unaligned_le16(pbeacon);

	/* capability */
	cap = get_unaligned_le16(ie);
+2 −2
Original line number Diff line number Diff line
@@ -347,9 +347,9 @@ u16 rtw_get_capability23a(struct wlan_bssid_ex *bss)
	return le16_to_cpu(val);
}

u8 *rtw_get_beacon_interval23a_from_ie(u8 *ie)
__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie)
{
	return ie + 8;
	return (__le16 *)(ie + 8);
}

int rtw_init_mlme_priv23a (struct rtw_adapter *padapter)
+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ int rtw_if_up23a(struct rtw_adapter *padapter);
int rtw_linked_check(struct rtw_adapter *padapter);

__le16 *rtw_get_capability23a_from_ie(u8 *ie);
u8 *rtw_get_beacon_interval23a_from_ie(u8 *ie);
__le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie);


void rtw_joinbss_reset23a(struct rtw_adapter *padapter);