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

staging: rtl8723au: Get rid of last HT OP mode duplicate defines 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95a4c8c2

drivers/staging/rtl8723au/core/rtw_ap.c

+4 −5
Original line number Diff line number Diff line
@@ -1416,18 +1416,17 @@ static int rtw_ht_operation_update(struct rtw_adapter *padapter) 
	 * station is associated. Probably it's a theoretical case, since

	 * it looks like all known HT STAs support greenfield.

	 */

	new_op_mode = 0;

	if (pmlmepriv->num_sta_no_ht ||

	    (pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT))

		new_op_mode = OP_MODE_MIXED;

		new_op_mode = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED;

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

		  IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&

		 pmlmepriv->num_sta_ht_20mhz)

		new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;

		new_op_mode = IEEE80211_HT_OP_MODE_PROTECTION_20MHZ;

	else if (pmlmepriv->olbc_ht)

		new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;

		new_op_mode = IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER;

	else

		new_op_mode = OP_MODE_PURE;

		new_op_mode = IEEE80211_HT_OP_MODE_PROTECTION_NONE;



	cur_op_mode = pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_PROTECTION;

	if (cur_op_mode != new_op_mode) {

drivers/staging/rtl8723au/include/wifi.h

+0 −5
Original line number Diff line number Diff line
@@ -213,11 +213,6 @@ struct ADDBA_request { 
}  __packed;





#define OP_MODE_PURE                    0

#define OP_MODE_MAY_BE_LEGACY_STAS      1

#define OP_MODE_20MHZ_HT_STA_ASSOCED    2

#define OP_MODE_MIXED                   3



/*	===============WPS Section=============== */

/*	WPS attribute ID */

#define WPS_ATTR_VER1				0x104A