From: Johannes Berg <johannes.berg@xxxxxxxxx> 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@xxxxxxxxx> --- 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); -- 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
