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

Commit 6b644e52 authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: remove ieee80211_get_hdrlen 



All users have been moved over to the version taking a le16 frame control
rather than a cpu-endian value.

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

include/net/mac80211.h

+0 −10
Original line number Diff line number Diff line
@@ -1558,16 +1558,6 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif); 
 */

unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);



/**

 * ieee80211_get_hdrlen - get header length from frame control

 *

 * This function returns the 802.11 header length in bytes (not including

 * encryption headers.)

 *

 * @fc: the frame control field (in CPU endianness)

 */

int ieee80211_get_hdrlen(u16 fc);



/**

 * ieee80211_hdrlen - get header length in bytes from frame control

 * @fc: frame control field in little-endian format

net/mac80211/util.c

+0 −39
Original line number Diff line number Diff line
@@ -91,45 +91,6 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, 
	return NULL;

}



int ieee80211_get_hdrlen(u16 fc)

{

	int hdrlen = 24;



	switch (fc & IEEE80211_FCTL_FTYPE) {

	case IEEE80211_FTYPE_DATA:

		if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))

			hdrlen = 30; /* Addr4 */

		/*

		 * The QoS Control field is two bytes and its presence is

		 * indicated by the IEEE80211_STYPE_QOS_DATA bit. Add 2 to

		 * hdrlen if that bit is set.

		 * This works by masking out the bit and shifting it to

		 * bit position 1 so the result has the value 0 or 2.

		 */

		hdrlen += (fc & IEEE80211_STYPE_QOS_DATA)

				>> (ilog2(IEEE80211_STYPE_QOS_DATA)-1);

		break;

	case IEEE80211_FTYPE_CTL:

		/*

		 * ACK and CTS are 10 bytes, all others 16. To see how

		 * to get this condition consider

		 *   subtype mask:   0b0000000011110000 (0x00F0)

		 *   ACK subtype:    0b0000000011010000 (0x00D0)

		 *   CTS subtype:    0b0000000011000000 (0x00C0)

		 *   bits that matter:         ^^^      (0x00E0)

		 *   value of those: 0b0000000011000000 (0x00C0)

		 */

		if ((fc & 0xE0) == 0xC0)

			hdrlen = 10;

		else

			hdrlen = 16;

		break;

	}



	return hdrlen;

}

EXPORT_SYMBOL(ieee80211_get_hdrlen);



unsigned int ieee80211_hdrlen(__le16 fc)

{

	unsigned int hdrlen = 24;