summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2015-08-03 10:55:24 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-08-14 17:49:47 +0200
commit9189ee31df40f88808daee10aa7f99ba43ff8b13 (patch)
tree20735c23e24a5eaf7ab676b249152d233ae6a784
parentcfg80211: regulatory: handle 5 and 10 MHz channels properly (diff)
downloadlinux-9189ee31df40f88808daee10aa7f99ba43ff8b13.tar.xz
linux-9189ee31df40f88808daee10aa7f99ba43ff8b13.zip
cfg80211: propagate set_wiphy failure to userspace
If driver failed to setup wiphy params (e.g. rts threshold, fragmentation treshold) userspace wasn't properly notified about this. This could lead to user confusion who would think the command succeeded even if that wasn't the case. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/nl80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 76b41578a838..5849fa199f77 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2321,6 +2321,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
rdev->wiphy.frag_threshold = old_frag_threshold;
rdev->wiphy.rts_threshold = old_rts_threshold;
rdev->wiphy.coverage_class = old_coverage_class;
+ return result;
}
}
return 0;