From e994412fb6ff3b7525a1b8e1138a66c352dfa123 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 26 Sep 2007 15:19:43 +0200
Subject: [PATCH] --- yaml --- r: 66785 b: refs/heads/master c:
 fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6 h: refs/heads/master i:   66783:
 757c446aecf407b0560dd54a480034a24780fdd5 v: v3

---
 [refs]                               | 2 +-
 trunk/net/mac80211/ieee80211.c       | 7 +++++++
 trunk/net/mac80211/ieee80211_i.h     | 2 +-
 trunk/net/mac80211/ieee80211_iface.c | 3 +++
 trunk/net/mac80211/rx.c              | 8 ++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bca60e9d204..3e9c5b23b1f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af1a90da397f071d7ee893145a1e7b2124689376
+refs/heads/master: fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6
diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c
index 52638194e45f..b1180536c335 100644
--- a/trunk/net/mac80211/ieee80211.c
+++ b/trunk/net/mac80211/ieee80211.c
@@ -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) {
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
index a5961f16f206..636de70cd85d 100644
--- a/trunk/net/mac80211/ieee80211_i.h
+++ b/trunk/net/mac80211/ieee80211_i.h
@@ -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;
 
diff --git a/trunk/net/mac80211/ieee80211_iface.c b/trunk/net/mac80211/ieee80211_iface.c
index 369ee4f52a29..60cee6e602d2 100644
--- a/trunk/net/mac80211/ieee80211_iface.c
+++ b/trunk/net/mac80211/ieee80211_iface.c
@@ -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 */
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 453ccab060a2..34adc5288fbc 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -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;