From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Oct 2021 07:36:59 +0000 (+0200)
Subject: Merge 5.15-rc6 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4a8033ec560c9fedaaddaf9c8a3e4b6244d8d61a;p=linux.git

Merge 5.15-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

4a8033ec560c9fedaaddaf9c8a3e4b6244d8d61a
diff --cc drivers/staging/r8188eu/hal/hal_intf.c
index 4e4f4d1c680d7,f27eba72d646f..fee3a598b59dd
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@@ -46,9 -245,10 +46,9 @@@ void rtw_hal_update_ra_mask(struct adap
  	struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
  
  	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
 -#ifdef CONFIG_88EU_AP_MODE
  		struct sta_info *psta = NULL;
  		struct sta_priv *pstapriv = &adapt->stapriv;
- 		if ((mac_id - 1) > 0)
+ 		if (mac_id >= 2)
  			psta = pstapriv->sta_aid[(mac_id - 1) - 1];
  		if (psta)
  			add_RATid(adapt, psta, 0);/* todo: based on rssi_level*/