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

Commit 7d0b4f3c authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove unnecessary length #define's. 



This driver statically defines constants representing the size of
certain structs using literal integers as values.  Replace those
constants with the sizeof() macro.  Other length constants are already
defined in 'linux/ieee80211.h'; remove those #define's.

Signed-off-by: default avatarQuytelda Kahja <quytelda@tamalin.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5befa937

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	}





	if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) {

	if (pkt_len < sizeof(struct ieee80211_hdr_3addr) + ie_offset) {

		DBG_871X("handle_assoc(reassoc =%d) - too short payload (len =%lu)"

		       "\n", reassoc, (unsigned long)pkt_len);

		return _FAIL;
@@ -1236,8 +1236,8 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	/* listen_interval = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN+2)); */

	listen_interval = RTW_GET_LE16(pframe + WLAN_HDR_A3_LEN+2);



	left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset);

	pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset);

	left = pkt_len - (sizeof(struct ieee80211_hdr_3addr) + ie_offset);

	pos = pframe + (sizeof(struct ieee80211_hdr_3addr) + ie_offset);





	DBG_871X("%s\n", __func__);

drivers/staging/rtl8723bs/include/ieee80211.h

+0 −16
Original line number Diff line number Diff line
@@ -272,20 +272,6 @@ struct sta_data{ 
	u64	tx_drops;

};



#define IEEE80211_DATA_LEN		2304

/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section

   6.2.1.1.2.



   The figure in section 7.1.2 suggests a body size of up to 2312

   bytes is allowed, which is a bit confusing, I suspect this

   represents the 2304 bytes of real data, plus a possible 8 bytes of

   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */





#define IEEE80211_HLEN			30

#define IEEE80211_FRAME_LEN		(IEEE80211_DATA_LEN + IEEE80211_HLEN)





/* this is stolen from ipw2200 driver */

#define IEEE_IBSS_MAC_HASH_SIZE 31
@@ -313,8 +299,6 @@ enum eap_type { 
	EAPOL_ENCAP_ASF_ALERT

};



#define IEEE80211_3ADDR_LEN 24

#define IEEE80211_4ADDR_LEN 30

#define IEEE80211_FCS_LEN    4



#define MIN_FRAG_THRESHOLD     256U