Search Linux Wireless

[PATCH} mac80211: correction of IFTYPE_AP and IFTYPE_AP_VLAN in ieee80211_do_stop

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



While doing a code review, I noticed that in the latest stable version of the kernel (3.18.1) the functionality of IFTYPE_AP and IFTYPE_AP_VLAN is switched in ieee80211_do_stop. In the case of IEEE80211_IFTYPE_AP, the list of devices in sdata->u.ap.vlans are closed, while in the case of IEEE80211_IFTYPE_AP_VLAN the skbs in sdata->bss->ps->bc_buf are freed. I believe this should be the other way around.

I found that the error already existed since 3.9.13, but was not yet present in 3.2. I didn't check any versions between those.

The following patch corrects the above stated error. This correction has not been tested, it was discovered during a code review.

Signed-off-by: Wim Torfs wtorfs@xxxxxxxxx

---

diff -uprN linux-3.18.1.orig/net/mac80211/iface.c linux-3.18.1.patched/net/mac80211/iface.c --- linux-3.18.1.orig/net/mac80211/iface.c 2014-12-16 18:39:45.000000000 +0100 +++ linux-3.18.1.patched/net/mac80211/iface.c 2015-01-06 12:49:50.000000000 +0100
@@ -868,7 +868,7 @@ static void ieee80211_do_stop(struct iee
 	}

 	/* APs need special treatment */
-	if (sdata->vif.type == NL80211_IFTYPE_AP) {
+	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
 		struct ieee80211_sub_if_data *vlan, *tmpsdata;

 		/* down all dependent devices, that is VLANs */
@@ -876,7 +876,7 @@ static void ieee80211_do_stop(struct iee
 					 u.vlan.list)
 			dev_close(vlan->dev);
 		WARN_ON(!list_empty(&sdata->u.ap.vlans));
-	} else if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+	} else if (sdata->vif.type == NL80211_IFTYPE_AP) {
 		/* remove all packets in parent bc_buf pointing to this dev */
 		ps = &sdata->bss->ps;

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux