From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 10 Feb 2009 20:25:38 +0000 (+0100)
Subject: mac80211: disable IBSS beacon before join
X-Git-Tag: v2.6.30-rc1~662^2~738^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e1333624827e7a91b2d2cc04ce978f050cae15e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

mac80211: disable IBSS beacon before join

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.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index caf9242..956afea 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -210,6 +210,8 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
 					!!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;