summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-18 22:13:18 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-03-18 22:14:26 +0100
commit3eb92f6a3948c4358eb8ad1c0905490ddd2fc0ab (patch)
tree6dc064283706358f6b7730d3b072f1ec1612a457
parent445ea4e83ec50668cc9ad7e5cf96d242f19165e8 (diff)
mac80211_hwsim: assign CAB queue properly on interface type change
When an interface change type, the CAB queue must be reassigned, do this in hwsim to avoid warnings/crashes. Reported-by: Jouni Malinen <j@w1.fi> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 3466f1a8a8d3..0064d38276bf 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -964,6 +964,12 @@ static int mac80211_hwsim_change_interface(struct ieee80211_hw *hw,
newtype, vif->addr);
hwsim_check_magic(vif);
+ /*
+ * interface may change from non-AP to AP in
+ * which case this needs to be set up again
+ */
+ vif->cab_queue = 0;
+
return 0;
}