Commit a6828493 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move ieee80211_get_bssid into RX file 



This function is only used in the RX code, so moving it into
that file gives the compiler better optimisation possibilities
and also allows us to remove the check for short frames (which
in the RX path cannot happen, but as a generic utility needed
to be checked.)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9ad8b21b

net/mac80211/ieee80211_i.h

+0 −2
Original line number Diff line number Diff line
@@ -1762,8 +1762,6 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw) 


/* utility functions/constants */

extern const void *const mac80211_wiphy_privid; /* for wiphy privid */

u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,

			enum nl80211_iftype type);

int ieee80211_frame_duration(enum ieee80211_band band, size_t len,

			     int rate, int erp, int short_preamble,

			     int shift);

net/mac80211/rx.c

+45 −0
Original line number Diff line number Diff line
@@ -42,6 +42,51 @@ static inline void ieee80211_rx_stats(struct net_device *dev, u32 len) 
	u64_stats_update_end(&tstats->syncp);

}



static u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,

			       enum nl80211_iftype type)

{

	__le16 fc = hdr->frame_control;



	if (ieee80211_is_data(fc)) {

		if (len < 24) /* drop incorrect hdr len (data) */

			return NULL;



		if (ieee80211_has_a4(fc))

			return NULL;

		if (ieee80211_has_tods(fc))

			return hdr->addr1;

		if (ieee80211_has_fromds(fc))

			return hdr->addr2;



		return hdr->addr3;

	}



	if (ieee80211_is_mgmt(fc)) {

		if (len < 24) /* drop incorrect hdr len (mgmt) */

			return NULL;

		return hdr->addr3;

	}



	if (ieee80211_is_ctl(fc)) {

		if (ieee80211_is_pspoll(fc))

			return hdr->addr1;



		if (ieee80211_is_back_req(fc)) {

			switch (type) {

			case NL80211_IFTYPE_STATION:

				return hdr->addr2;

			case NL80211_IFTYPE_AP:

			case NL80211_IFTYPE_AP_VLAN:

				return hdr->addr1;

			default:

				break; /* fall through to the return */

			}

		}

	}



	return NULL;

}



/*

 * monitor mode reception

 *

net/mac80211/util.c

+0 −49
Original line number Diff line number Diff line
@@ -47,55 +47,6 @@ struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy) 
}

EXPORT_SYMBOL(wiphy_to_ieee80211_hw);



u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,

			enum nl80211_iftype type)

{

	__le16 fc = hdr->frame_control;



	 /* drop ACK/CTS frames and incorrect hdr len (ctrl) */

	if (len < 16)

		return NULL;



	if (ieee80211_is_data(fc)) {

		if (len < 24) /* drop incorrect hdr len (data) */

			return NULL;



		if (ieee80211_has_a4(fc))

			return NULL;

		if (ieee80211_has_tods(fc))

			return hdr->addr1;

		if (ieee80211_has_fromds(fc))

			return hdr->addr2;



		return hdr->addr3;

	}



	if (ieee80211_is_mgmt(fc)) {

		if (len < 24) /* drop incorrect hdr len (mgmt) */

			return NULL;

		return hdr->addr3;

	}



	if (ieee80211_is_ctl(fc)) {

		if (ieee80211_is_pspoll(fc))

			return hdr->addr1;



		if (ieee80211_is_back_req(fc)) {

			switch (type) {

			case NL80211_IFTYPE_STATION:

				return hdr->addr2;

			case NL80211_IFTYPE_AP:

			case NL80211_IFTYPE_AP_VLAN:

				return hdr->addr1;

			default:

				break; /* fall through to the return */

			}

		}

	}



	return NULL;

}



void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx)

{

	struct sk_buff *skb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE