Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a96ae6f4 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8723au: Fix sparse warnings in core/rtw_ap.c 



The following warnings are fixed:

drivers/staging/rtl8723au/core/rtw_ap.c:79:23: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8723au/core/rtw_ap.c:79:23:    expected unsigned short [unsigned] [usertype] tim_bitmap_le
drivers/staging/rtl8723au/core/rtw_ap.c:79:23:    got restricted __le16 [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_ap.c:1441:37: warning: restricted __le16 degrades to integer

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0b99bed

drivers/staging/rtl8723au/core/rtw_ap.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ static void update_BCNTIM(struct rtw_adapter *padapter) 
	struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;

	struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;

	unsigned char *pie = pnetwork_mlmeext->IEs;

	unsigned char *pie = pnetwork_mlmeext->IEs;

	u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;

	u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;

	u16 tim_bitmap_le;

	__le16 tim_bitmap_le;

	uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;

	uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;





	tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);

	tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
@@ -1439,8 +1439,9 @@ static int rtw_ht_operation_update(struct rtw_adapter *padapter) 
	if (pmlmepriv->num_sta_no_ht ||

	if (pmlmepriv->num_sta_no_ht ||

	    (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))

	    (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))

		new_op_mode = OP_MODE_MIXED;

		new_op_mode = OP_MODE_MIXED;

	else if ((phtpriv_ap->ht_cap.cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40)

	else if ((le16_to_cpu(phtpriv_ap->ht_cap.cap_info) &

		 && pmlmepriv->num_sta_ht_20mhz)

		  IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&

		 pmlmepriv->num_sta_ht_20mhz)

		new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;

		new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;

	else if (pmlmepriv->olbc_ht)

	else if (pmlmepriv->olbc_ht)

		new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;

		new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;