Skip to contentSkip to conversation

mac80211: disable IBSS beacon before join

PATCH Superseded Johannes Berg 2 participants 4 messages Feb 6, 2009 – Feb 7, 2009 mac80211

lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

PATCH 1/1 mac80211: disable IBSS beacon before join

---
 net/mac80211/main.c |    2 ++
 1 file changed, 2 insertions(+)
net/mac80211/main.c +2 -0
@@ -210,6 +210,8 @@ int ieee80211_if_config(struct ieee80211
 					!!rcu_dereference(sdata->u.ap.beacon);
 				break;
 			case NL80211_IFTYPE_ADHOC:
+				conf.enable_beacon = !!sdata->u.sta.probe_resp;
+				break;
 			case NL80211_IFTYPE_MESH_POINT:
 				conf.enable_beacon = true;
 				break;
author maintainer
#2 lore raw
Quoted 6 lines · Larry Finger
Quoted 2 lines · Johannes Berg

---

This patch needs a more-definitive commit message. In the git log, one won't see the diff, and will have no idea what it does.

Yeah, it should have some more text, I just couldn't think of anything more elaborate than the subject. Will come up with something and repost, I guess.

johannes

author maintainer
#3 lore raw

PATCH v2 1/1 mac80211: disable IBSS beacon before join

In reply to Larry Finger

Before we have a probe response frame (which is used as the beacon too) there's no need to ask drivers to beacon, they will not get a beacon anyway.

---
 net/mac80211/main.c |    2 ++
 1 file changed, 2 insertions(+)
net/mac80211/main.c +2 -0
@@ -210,6 +210,8 @@ int ieee80211_if_config(struct ieee80211
 					!!rcu_dereference(sdata->u.ap.beacon);
 				break;
 			case NL80211_IFTYPE_ADHOC:
+				conf.enable_beacon = !!sdata->u.sta.probe_resp;
+				break;
 			case NL80211_IFTYPE_MESH_POINT:
 				conf.enable_beacon = true;
 				break;