mac80211: use new helpers in util.c - ieee80211_get_bssid() (a494bb1c) · Commits · e / devices / android_kernel_fairphone_FP4

net/mac80211/util.c

+19 −22

Original line number	Diff line number	Diff line
		@@ -45,38 +45,37 @@ const unsigned char bridge_tunnel_header[] __aligned(2) =
		u8 ieee80211_get_bssid(struct ieee80211_hdr hdr, size_t len,
		enum ieee80211_if_types type)
		{
		u16 fc;
		__le16 fc = hdr->frame_control;

		/* drop ACK/CTS frames and incorrect hdr len (ctrl) */
		if (len < 16)
		return NULL;

		fc = le16_to_cpu(hdr->frame_control);

		switch (fc & IEEE80211_FCTL_FTYPE) {
		case IEEE80211_FTYPE_DATA:
		if (ieee80211_is_data(fc)) {
		if (len < 24) /* drop incorrect hdr len (data) */
		return NULL;
		switch (fc & (IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS)) {
		case IEEE80211_FCTL_TODS:
		return hdr->addr1;
		case (IEEE80211_FCTL_TODS \| IEEE80211_FCTL_FROMDS):

		if (ieee80211_has_a4(fc))
		return NULL;
		case IEEE80211_FCTL_FROMDS:
		if (ieee80211_has_tods(fc))
		return hdr->addr1;
		if (ieee80211_has_fromds(fc))
		return hdr->addr2;
		case 0:

		return hdr->addr3;
		}
		break;
		case IEEE80211_FTYPE_MGMT:

		if (ieee80211_is_mgmt(fc)) {
		if (len < 24) /* drop incorrect hdr len (mgmt) */
		return NULL;
		return hdr->addr3;
		case IEEE80211_FTYPE_CTL:
		if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)
		}

		if (ieee80211_is_ctl(fc)) {
		if(ieee80211_is_pspoll(fc))
		return hdr->addr1;
		else if ((fc & IEEE80211_FCTL_STYPE) ==
		IEEE80211_STYPE_BACK_REQ) {

		if (ieee80211_is_back_req(fc)) {
		switch (type) {
		case IEEE80211_IF_TYPE_STA:
		return hdr->addr2;
		@@ -84,11 +83,9 @@ u8 ieee80211_get_bssid(struct ieee80211_hdr hdr, size_t len,
		case IEEE80211_IF_TYPE_VLAN:
		return hdr->addr1;
		default:
		return NULL;
		break; /* fall through to the return */
		}
		}
		else
		return NULL;
		}

		return NULL;