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

Commit fb1c1cd6 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[PATCH] mac80211: fix vlan bug 



VLAN interfaces have yet another bug: they aren't accounted
for properly in the receive path in prepare_for_handlers().
I noticed this by code inspection, but it would be easy for
the compiler to catch such things if we'd just use the proper
enum where appropriate.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af1a90da

net/mac80211/ieee80211.c

+7 −0
Original line number Diff line number Diff line
@@ -344,6 +344,13 @@ static int ieee80211_open(struct net_device *dev) 
		if (!sdata->u.vlan.ap)

			return -ENOLINK;

		break;

	case IEEE80211_IF_TYPE_AP:

	case IEEE80211_IF_TYPE_MGMT:

	case IEEE80211_IF_TYPE_STA:

	case IEEE80211_IF_TYPE_MNTR:

	case IEEE80211_IF_TYPE_IBSS:

		/* no special treatment */

		break;

	}



	if (local->open_count == 0) {

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct ieee80211_if_sta { 
#define IEEE80211_SDATA_SHORT_PREAMBLE	BIT(3)

struct ieee80211_sub_if_data {

	struct list_head list;

	unsigned int type;

	enum ieee80211_if_types type;



	struct wireless_dev wdev;

net/mac80211/ieee80211_iface.c

+3 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ void ieee80211_if_reinit(struct net_device *dev) 
	ieee80211_if_sdata_deinit(sdata);



	switch (sdata->type) {

	case IEEE80211_IF_TYPE_MGMT:

		/* nothing to do */

		break;

	case IEEE80211_IF_TYPE_AP: {

		/* Remove all virtual interfaces that use this BSS

		 * as their sdata->bss */

net/mac80211/rx.c

+8 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, 
			rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb,

							 bssid, hdr->addr2);

		break;

	case IEEE80211_IF_TYPE_VLAN:

	case IEEE80211_IF_TYPE_AP:

		if (!bssid) {

			if (compare_ether_addr(sdata->dev->dev_addr,
@@ -1449,6 +1450,13 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, 
		if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))

			return 0;

		break;

	case IEEE80211_IF_TYPE_MNTR:

		/* take everything */

		break;

	case IEEE80211_IF_TYPE_MGMT:

		/* should never get here */

		WARN_ON(1);

		break;

	}



	return 1;