From 23031335197983bc4a0d6dc502438e093f4c15d2 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 10 Feb 2009 21:25:38 +0100
Subject: [PATCH] --- yaml --- r: 134479 b: refs/heads/master c:
 5e1333624827e7a91b2d2cc04ce978f050cae15e h: refs/heads/master i:   134477:
 e19de1a7fb1be5491bf5f09475e1bbfe808d4fa8   134475:
 ea961cd781132a3d83f64c98c088d28688df96d6   134471:
 bfa54935204f105222400c368975d340c3cd088a   134463:
 242fb4d0339ac9dd852ac0e5b3488e1ba02db684 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aee1fae38761..283b111a11ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 570a0a7c3ba6e44b0fe7f1d42e69ba139b533737
+refs/heads/master: 5e1333624827e7a91b2d2cc04ce978f050cae15e
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index caf92424c76d..956afea4214d 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/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;