summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-08-23 09:49:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-08-23 09:49:42 -0400
commita4881cc45a3fab4488e16c4934e149cfa620f1a9 (patch)
tree653eaec2c015a52ba17b4e1b714251b9472925ec /net/mac80211
parent6de3f7e911d27d6737c79b3f6b5069044ea408ec (diff)
parentaba4e6fff8de0c92e53f0e7ef077231e75f7d760 (diff)
downloadop-kernel-dev-a4881cc45a3fab4488e16c4934e149cfa620f1a9.zip
op-kernel-dev-a4881cc45a3fab4488e16c4934e149cfa620f1a9.tar.gz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 69b322f..929f897 100644
--- a/net/mac80211/cfg.c
+++ b/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);
OpenPOWER on IntegriCloud