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

Commit 5a433b3a authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: remove unnecessary byteshifts in frame control testing 



Byteswap the constants rather than the frame_control member.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88787d28

include/linux/ieee80211.h

+17 −15
Original line number Diff line number Diff line
@@ -552,17 +552,18 @@ enum ieee80211_back_parties { 
 */

static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr)

{

	u8 *raw = (u8 *) hdr;

	u8 tofrom = (*(raw+1)) & 3; /* get the TODS and FROMDS bits */

	__le16 fc = hdr->frame_control;

	fc &= cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);



	switch (tofrom) {

		case 2:

	switch (fc) {

	case __constant_cpu_to_le16(IEEE80211_FCTL_FROMDS):

		return hdr->addr3;

		case 3:

	case __constant_cpu_to_le16(IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS):

		return hdr->addr4;

	}

	default:

		return hdr->addr2;

	}

}



/**

 * ieee80211_get_DA - get pointer to DA
@@ -577,11 +578,12 @@ static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr) 
 */

static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)

{

	u8 *raw = (u8 *) hdr;

	u8 to_ds = (*(raw+1)) & 1; /* get the TODS bit */

	__le16 fc = hdr->frame_control;

	fc &= cpu_to_le16(IEEE80211_FCTL_TODS);



	if (to_ds)

	if (fc)

		return hdr->addr3;

	else

		return hdr->addr1;

}
@@ -595,8 +597,8 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr) 
 */

static inline int ieee80211_get_morefrag(struct ieee80211_hdr *hdr)

{

	return (le16_to_cpu(hdr->frame_control) &

		IEEE80211_FCTL_MOREFRAGS) != 0;

	__le16 fc = hdr->frame_control;

	return !!(fc & cpu_to_le16(IEEE80211_FCTL_MOREFRAGS));

}



#endif /* IEEE80211_H */