summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorUjjal Roy <royujjal@gmail.com>2014-01-06 17:26:11 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-01-06 20:00:12 +0100
commit60a4fe0ae97b515f174f9bcb157cbaeff0dab8ac (patch)
tree2dc1861615547f2acceb556c7a93e5d27136daec /net/wireless
parentmac80211: enable WME for peer mesh STA (diff)
downloadlinux-60a4fe0ae97b515f174f9bcb157cbaeff0dab8ac.tar.xz
linux-60a4fe0ae97b515f174f9bcb157cbaeff0dab8ac.zip
cfg80211: fix wext-compat for getting retry value
While getting the retry limit, wext-compat returns the value without updating the flag for retry->flags is 0. Also in this case, it updates long retry flag when short and long retry value are unequal. So, iwconfig never showing "Retry short limit" and showing "Retry long limit" when both values are unequal. Updated the flags and corrected the condition properly. Signed-off-by: Ujjal Roy <royujjal@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/wext-compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index e7c6e862580d..051d961d4e28 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -412,9 +412,9 @@ int cfg80211_wext_giwretry(struct net_device *dev,
* First return short value, iwconfig will ask long value
* later if needed
*/
- retry->flags |= IW_RETRY_LIMIT;
+ retry->flags |= IW_RETRY_LIMIT | IW_RETRY_SHORT;
retry->value = wdev->wiphy->retry_short;
- if (wdev->wiphy->retry_long != wdev->wiphy->retry_short)
+ if (wdev->wiphy->retry_long == wdev->wiphy->retry_short)
retry->flags |= IW_RETRY_LONG;
return 0;