Commit bd7a168a authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: use common ieee80211 constants 



Many defined constants in wifi.h are unused and/or available from
<linux/ieee80211.h>, some with slightly different names. Use the
common ones, rename where necessary and remove unused.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200701164213.4205-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee53f6dd

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static int r8711_wx_get_rate(struct net_device *dev, 
		pht_capie = (struct rtl_ieee80211_ht_cap *)(p + 2);

		memcpy(&mcs_rate, pht_capie->supp_mcs_set, 2);

		bw_40MHz = (le16_to_cpu(pht_capie->cap_info) &

			    IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0;

			    IEEE80211_HT_CAP_SUP_WIDTH_20_40) ? 1 : 0;

		short_GI = (le16_to_cpu(pht_capie->cap_info) &

			    (IEEE80211_HT_CAP_SGI_20 |

			    IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;

drivers/staging/rtl8712/rtl871x_mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -1660,14 +1660,14 @@ unsigned int r8712_restructure_ht_ie(struct _adapter *padapter, u8 *in_ie, 
		}

		out_len = *pout_len;

		memset(&ht_capie, 0, sizeof(struct rtl_ieee80211_ht_cap));

		ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH |

		ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |

				    IEEE80211_HT_CAP_SGI_20 |

				    IEEE80211_HT_CAP_SGI_40 |

				    IEEE80211_HT_CAP_TX_STBC |

				    IEEE80211_HT_CAP_MAX_AMSDU |

				    IEEE80211_HT_CAP_DSSSCCK40);

		ht_capie.ampdu_params_info = (IEEE80211_HT_CAP_AMPDU_FACTOR &

				0x03) | (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00);

		ht_capie.ampdu_params_info = (IEEE80211_HT_AMPDU_PARM_FACTOR &

				0x03) | (IEEE80211_HT_AMPDU_PARM_DENSITY & 0x00);

		r8712_set_ie(out_ie + out_len, _HT_CAPABILITY_IE_,

			     sizeof(struct rtl_ieee80211_ht_cap),

			     (unsigned char *)&ht_capie, pout_len);
@@ -1705,7 +1705,7 @@ static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len) 
	if (p && len > 0) {

		pht_capie = (struct rtl_ieee80211_ht_cap *)(p + 2);

		max_ampdu_sz = (pht_capie->ampdu_params_info &

				IEEE80211_HT_CAP_AMPDU_FACTOR);

				IEEE80211_HT_AMPDU_PARM_FACTOR);

		/* max_ampdu_sz (kbytes); */

		max_ampdu_sz = 1 << (max_ampdu_sz + 3);

		phtpriv->rx_ampdu_maxlen = max_ampdu_sz;

drivers/staging/rtl8712/wifi.h

+0 −51
Original line number Diff line number Diff line
@@ -437,13 +437,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) 
 *------------------------------------------------------------------------------

 */



/* block-ack parameters */

#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002

#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C

#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0

#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000

#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800



#define SetOrderBit(pbuf) ({ \

	*(__le16 *)(pbuf) |= cpu_to_le16(_ORDER_); \

})
@@ -481,49 +474,5 @@ struct ieee80211_ht_addt_info { 
	unsigned char		basic_set[16];

} __packed;



/* 802.11n HT capabilities masks */

#define IEEE80211_HT_CAP_SUP_WIDTH		0x0002

#define IEEE80211_HT_CAP_SM_PS			0x000C

#define IEEE80211_HT_CAP_GRN_FLD		0x0010

#define IEEE80211_HT_CAP_SGI_20			0x0020

#define IEEE80211_HT_CAP_SGI_40			0x0040

#define IEEE80211_HT_CAP_TX_STBC			0x0080

#define IEEE80211_HT_CAP_DELAY_BA		0x0400

#define IEEE80211_HT_CAP_MAX_AMSDU		0x0800

#define IEEE80211_HT_CAP_DSSSCCK40		0x1000

/* 802.11n HT capability AMPDU settings */

#define IEEE80211_HT_CAP_AMPDU_FACTOR		0x03

#define IEEE80211_HT_CAP_AMPDU_DENSITY		0x1C

/* 802.11n HT capability MSC set */

#define IEEE80211_SUPP_MCS_SET_UEQM		4

#define IEEE80211_HT_CAP_MAX_STREAMS		4

#define IEEE80211_SUPP_MCS_SET_LEN		10

/* maximum streams the spec allows */

#define IEEE80211_HT_CAP_MCS_TX_DEFINED		0x01

#define IEEE80211_HT_CAP_MCS_TX_RX_DIFF		0x02

#define IEEE80211_HT_CAP_MCS_TX_STREAMS		0x0C

#define IEEE80211_HT_CAP_MCS_TX_UEQM		0x10

/* 802.11n HT IE masks */

#define IEEE80211_HT_IE_CHA_SEC_OFFSET		0x03

#define IEEE80211_HT_IE_CHA_SEC_NONE		0x00

#define IEEE80211_HT_IE_CHA_SEC_ABOVE		0x01

#define IEEE80211_HT_IE_CHA_SEC_BELOW		0x03

#define IEEE80211_HT_IE_CHA_WIDTH		0x04

#define IEEE80211_HT_IE_HT_PROTECTION		0x0003

#define IEEE80211_HT_IE_NON_GF_STA_PRSNT	0x0004

#define IEEE80211_HT_IE_NON_HT_STA_PRSNT	0x0010



/*

 * A-PMDU buffer sizes

 * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)

 */

#define IEEE80211_MIN_AMPDU_BUF 0x8



/* Spatial Multiplexing Power Save Modes */

#define WLAN_HT_CAP_SM_PS_STATIC		0

#define WLAN_HT_CAP_SM_PS_DYNAMIC	1

#define WLAN_HT_CAP_SM_PS_INVALID	2

#define WLAN_HT_CAP_SM_PS_DISABLED	3



#endif /* _WIFI_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE