2014-01-06 16:26:35

by Ujjal Roy

Subject: [PATCH] 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 <[email protected]>
---
net/wireless/wext-compat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index e7c6e86..051d961 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;
--
1.8.1.4

2014-01-06 19:01:42

by Johannes Berg

Subject: Re: [PATCH] cfg80211: fix wext-compat for getting retry value

On Mon, 2014-01-06 at 21:56 +0530, Ujjal Roy wrote:
> 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.

Looks fine, applied. Who cares though? :)

johannes