diff --git a/[refs] b/[refs]
index 23f50164d809..e6fe850b7d86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06d7de831dab8b93adb86e039a2f3d36604a9197
+refs/heads/master: aba4e6fff8de0c92e53f0e7ef077231e75f7d760
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 69b322f6ca2e..929f897a8ded 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -740,7 +740,7 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
 	struct probe_resp *new, *old;
 
 	if (!resp || !resp_len)
-		return -EINVAL;
+		return 1;
 
 	old = rtnl_dereference(sdata->u.ap.probe_resp);