* [PATCH] mac80211: don't return beacons when mesh is disabled
@ 2011-01-18 12:45 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2011-01-18 12:45 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless@vger.kernel.org
From: Johannes Berg <johannes.berg@intel.com>
When mesh is disabled, mac80211 was returning
beacons with an empty mesh ID. That isn't
desirable, even if drivers shouldn't be trying
to get beacons to start with.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/tx.c | 5 +++++
1 file changed, 5 insertions(+)
--- wireless-testing.orig/net/mac80211/tx.c 2011-01-13 12:07:19.000000000 +0100
+++ wireless-testing/net/mac80211/tx.c 2011-01-13 12:07:26.000000000 +0100
@@ -2299,6 +2299,11 @@ struct sk_buff *ieee80211_beacon_get_tim
struct ieee80211_mgmt *mgmt;
u8 *pos;
+#ifdef CONFIG_MAC80211_MESH
+ if (!sdata->u.mesh.mesh_id_len)
+ goto out;
+#endif
+
/* headroom, head length, tail length and maximum TIM length */
skb = dev_alloc_skb(local->tx_headroom + 400 +
sdata->u.mesh.vendor_ie_len);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-18 12:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-18 12:45 [PATCH] mac80211: don't return beacons when mesh is disabled Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.