2016-11-21 12:55:52

by Johannes Berg

Subject: [PATCH] nl80211: fix logic inversion in start_nan()

From: Johannes Berg <[email protected]>

Arend inadvertedly inverted the logic while converting to
wdev_running(), fix that.

Fixes: 73c7da3dae1e ("cfg80211: add generic helper to check interface is running")
Signed-off-by: Johannes Berg <[email protected]>
---
net/wireless/nl80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4e9bda49e957..e4f718e956d7 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10625,7 +10625,7 @@ static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info)
if (wdev->iftype != NL80211_IFTYPE_NAN)
return -EOPNOTSUPP;

- if (!wdev_running(wdev))
+ if (wdev_running(wdev))
return -EEXIST;

if (rfkill_blocked(rdev->rfkill))
--
2.9.3

2016-11-21 12:57:13

by Arend Van Spriel

Subject: Re: [PATCH] nl80211: fix logic inversion in start_nan()

On 21-11-2016 13:55, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> Arend inadvertedly inverted the logic while converting to
> wdev_running(), fix that.

It was indeed inadvertedly.

Thanks,
Arend

> Fixes: 73c7da3dae1e ("cfg80211: add generic helper to check interface is running")
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> net/wireless/nl80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index 4e9bda49e957..e4f718e956d7 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -10625,7 +10625,7 @@ static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info)
> if (wdev->iftype != NL80211_IFTYPE_NAN)
> return -EOPNOTSUPP;
>
> - if (!wdev_running(wdev))
> + if (wdev_running(wdev))
> return -EEXIST;
>
> if (rfkill_blocked(rdev->rfkill))
>

2016-11-21 12:58:39

by Arend Van Spriel

Subject: Re: [PATCH] nl80211: fix logic inversion in start_nan()

On 21-11-2016 13:57, Arend Van Spriel wrote:
> On 21-11-2016 13:55, Johannes Berg wrote:
>> From: Johannes Berg <[email protected]>
>>
>> Arend inadvertedly inverted the logic while converting to
>> wdev_running(), fix that.
>
> It was indeed inadvertedly.

Actually spelling checker complains. Should be 'inadvertently'.

Regards,
Arend

> Thanks,
> Arend
>
>> Fixes: 73c7da3dae1e ("cfg80211: add generic helper to check interface is running")
>> Signed-off-by: Johannes Berg <[email protected]>
>> ---
>> net/wireless/nl80211.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
>> index 4e9bda49e957..e4f718e956d7 100644
>> --- a/net/wireless/nl80211.c
>> +++ b/net/wireless/nl80211.c
>> @@ -10625,7 +10625,7 @@ static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info)
>> if (wdev->iftype != NL80211_IFTYPE_NAN)
>> return -EOPNOTSUPP;
>>
>> - if (!wdev_running(wdev))
>> + if (wdev_running(wdev))
>> return -EEXIST;
>>
>> if (rfkill_blocked(rdev->rfkill))
>>