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;