Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

This commit is contained in:
John W. Linville 2012-08-23 09:49:42 -04:00
commit a4881cc45a
3 changed files with 46 additions and 1 deletions

View file

@ -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);