Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] rsi: fix broken AP mode due to unwanted encryption
To:     Martin Fuzzey <martin.fuzzey@flowbird.group>,
        Amitkumar Karwar <amitkarwar@gmail.com>
Cc:     stable@vger.kernel.org, Siva Rebbagondla <siva8118@gmail.com>,
        Kalle Valo <kvalo@codeaurora.org>,
        linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <1622222314-17192-1-git-send-email-martin.fuzzey@flowbird.group>
From:   Marek Vasut <marex@denx.de>
Message-ID: <6f1d3952-c30e-4a6d-9857-5a6d68e962b2@denx.de>
Date:   Fri, 28 May 2021 20:11:01 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.10.0
MIME-Version: 1.0
In-Reply-To: <1622222314-17192-1-git-send-email-martin.fuzzey@flowbird.group>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/28/21 7:17 PM, Martin Fuzzey wrote:
> In AP mode WPA-PSK connections were not established.
> 
> The reason was that the AP was sending the first message
> of the 4 way handshake encrypted, even though no key had
> (correctly) yet been set.
> 
> Fix this by adding an extra check that we have a key.
> 
> The redpine downstream out of tree driver does it this way too.
> 
> Signed-off-by: Martin Fuzzey <martin.fuzzey@flowbird.group>
> CC: stable@vger.kernel.org

This likely needs a Fixes: tag ?

> ---
>   drivers/net/wireless/rsi/rsi_91x_hal.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
> index ce98921..ef84262 100644
> --- a/drivers/net/wireless/rsi/rsi_91x_hal.c
> +++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
> @@ -203,6 +203,7 @@ int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb)
>   		wh->frame_control |= cpu_to_le16(RSI_SET_PS_ENABLE);
>   
>   	if ((!(info->flags & IEEE80211_TX_INTFL_DONT_ENCRYPT)) &&
> +	    (info->control.hw_key) &&

The () are not needed.

>   	    (common->secinfo.security_enable)) {
>   		if (rsi_is_cipher_wep(common))
>   			ieee80211_size += 4;
> 
Otherwise, looks good, thanks. With those two things above fixed, add:

Reviewed-by: Marek Vasut <marex@denx.de>