On Tue, 2020-06-23 at 21:56 +0200, Greg Kroah-Hartman wrote:
From: Aiman Najjar aiman.najjar@hurranet.com
[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ]
This patch fixes remaining checkpatch warnings in rtl871x_xmit.c:
IMO: unless necessary for another patch, these types of whitespace or renaming only conversions patches should not be applied to stable.
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->PrivacyKeyIndex' 636: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:636:
(u8)psecuritypriv->PrivacyKeyIndex);WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 643: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:643:
(u8)psecuritypriv->XGrpKeyid);WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 652: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:652:
(u8)psecuritypriv->XGrpKeyid);Signed-off-by: Aiman Najjar aiman.najjar@hurranet.com Reviewed-by: Dan Carpenter dan.carpenter@oracle.com Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.158550817... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org
drivers/staging/rtl8712/rtl871x_xmit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index a8ae14ce66139..95d5c050a8947 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -601,7 +601,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, addr_t addr; u8 *pframe, *mem_start, *ptxdesc; struct sta_info *psta;
- struct security_priv *psecuritypriv = &padapter->securitypriv;
- struct security_priv *psecpriv = &padapter->securitypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct pkt_attrib *pattrib = &pxmitframe->attrib;
@@ -644,15 +644,13 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, case _WEP40_: case _WEP104_: WEP_IV(pattrib->iv, psta->txpn,
(u8)psecuritypriv->PrivacyKeyIndex);
(u8)psecpriv->PrivacyKeyIndex); break; case _TKIP_: if (bmcst) TKIP_IV(pattrib->iv, psta->txpn,
(u8)psecuritypriv->XGrpKeyid);
(u8)psecpriv->XGrpKeyid); else TKIP_IV(pattrib->iv, psta->txpn, 0);@@ -660,8 +658,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, case _AES_: if (bmcst) AES_IV(pattrib->iv, psta->txpn,
(u8)psecuritypriv->XGrpKeyid);
(u8)psecpriv->XGrpKeyid); else AES_IV(pattrib->iv, psta->txpn, 0);