2016-04-20 06:59:41

by Chun-Yeow Yeoh

Subject: [PATCH] rt2800usb: enable MFP if hw crypt is disabled

If rt2800usb is loaded with nohwcrypt=1, mac80211 takes
care of the crypto with software encryption/decryption
and thus, MFP can be used.

Tested for secured mesh using ath9k_htc and ath9k.

Signed-off-by: Chun-Yeow Yeoh <[email protected]>
---
drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
index 4b0bb6b..84ea329 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
@@ -48,6 +48,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");

static bool rt2800usb_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
{
+ ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
return modparam_nohwcrypt;
}

--
2.3.0

2016-04-20 16:06:26

by Stanislaw Gruszka

Subject: Re: [PATCH] rt2800usb: enable MFP if hw crypt is disabled

On Wed, Apr 20, 2016 at 02:59:32PM +0800, Chun-Yeow Yeoh wrote:
> If rt2800usb is loaded with nohwcrypt=1, mac80211 takes
> care of the crypto with software encryption/decryption
> and thus, MFP can be used.
>
> Tested for secured mesh using ath9k_htc and ath9k.
>
> Signed-off-by: Chun-Yeow Yeoh <[email protected]>
> ---
> drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
> index 4b0bb6b..84ea329 100644
> --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
> @@ -48,6 +48,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
>
> static bool rt2800usb_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
> {
> + ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
> return modparam_nohwcrypt;

You set MFP feature regardless if actually hwcrypt is disabled or not.
Beside this should not be done in function which is intended to test
if hw crypto is disabled. Please set the future in place where other
hw->flags are set.

Thanks
Stanislaw

2016-04-20 16:42:04

by Chun-Yeow Yeoh

Subject: Re: [PATCH] rt2800usb: enable MFP if hw crypt is disabled

Noted. Patch v2 sent.

----
Chun-Yeow

On Thu, Apr 21, 2016 at 12:04 AM, Stanislaw Gruszka <[email protected]> wrote:
> On Wed, Apr 20, 2016 at 02:59:32PM +0800, Chun-Yeow Yeoh wrote:
>> If rt2800usb is loaded with nohwcrypt=1, mac80211 takes
>> care of the crypto with software encryption/decryption
>> and thus, MFP can be used.
>>
>> Tested for secured mesh using ath9k_htc and ath9k.
>>
>> Signed-off-by: Chun-Yeow Yeoh <[email protected]>
>> ---
>> drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
>> index 4b0bb6b..84ea329 100644
>> --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
>> +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
>> @@ -48,6 +48,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
>>
>> static bool rt2800usb_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
>> {
>> + ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
>> return modparam_nohwcrypt;
>
> You set MFP feature regardless if actually hwcrypt is disabled or not.
> Beside this should not be done in function which is intended to test
> if hw crypto is disabled. Please set the future in place where other
> hw->flags are set.
>
> Thanks
> Stanislaw