Commit 60a4fe0a authored Jan 06, 2014 by Ujjal Roy Committed by Johannes Berg Jan 06, 2014

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>

parent 6b5895d9

net/wireless/wext-compat.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;