From 4c58beed9707189342abf3cd9260e433a87ac4e3 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 23 Jun 2020 20:17:50 -0400 Subject: [PATCH] Drop staging-rtl8712-fix-multiline-derefernce-warnings.patch Signed-off-by: Sasha Levin --- queue-4.14/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- queue-4.19/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- queue-4.4/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- queue-4.9/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- queue-5.4/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- queue-5.7/series | 1 - ...12-fix-multiline-derefernce-warnings.patch | 80 ------------------- 12 files changed, 486 deletions(-) delete mode 100644 queue-4.14/staging-rtl8712-fix-multiline-derefernce-warnings.patch delete mode 100644 queue-4.19/staging-rtl8712-fix-multiline-derefernce-warnings.patch delete mode 100644 queue-4.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch delete mode 100644 queue-4.9/staging-rtl8712-fix-multiline-derefernce-warnings.patch delete mode 100644 queue-5.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch delete mode 100644 queue-5.7/staging-rtl8712-fix-multiline-derefernce-warnings.patch diff --git a/queue-4.14/series b/queue-4.14/series index dcce989baa0..b2b27c431cf 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -34,7 +34,6 @@ apparmor-fix-introspection-of-of-task-mode-for-uncon.patch scsi-sr-fix-sr_probe-missing-deallocate-of-device-mi.patch scsi-ibmvscsi-don-t-send-host-info-in-adapter-info-m.patch staging-greybus-fix-a-missing-check-bug-in-gb_lights.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch scsi-qedi-do-not-flush-offload-work-if-arp-not-resol.patch alsa-usb-audio-improve-frames-size-computation.patch s390-qdio-put-thinint-indicator-after-early-error.patch diff --git a/queue-4.14/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-4.14/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index 33ca81dcf5a..00000000000 --- a/queue-4.14/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 8c858bf882f4f4813797582f632c56b26261d2bb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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 eda2aee02ff89..06e2377092fe0 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); --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index ec95e0f2e64..73b67379f79 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -46,7 +46,6 @@ scsi-ibmvscsi-don-t-send-host-info-in-adapter-info-m.patch apparmor-fix-nnp-subset-test-for-unconfined.patch x86-purgatory-disable-various-profiling-and-sanitizi.patch staging-greybus-fix-a-missing-check-bug-in-gb_lights.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch arm64-dts-mt8173-fix-unit-name-warnings.patch scsi-qedi-do-not-flush-offload-work-if-arp-not-resol.patch arm-dts-sun8i-h2-plus-bananapi-m2-zero-fix-led-polar.patch diff --git a/queue-4.19/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-4.19/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index d19e3765e99..00000000000 --- a/queue-4.19/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From d5ffdca252ccc5b6f8fddeac106d5f70ac06a56f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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); --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index a04ce3602e0..32a7ec4f116 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -17,7 +17,6 @@ yam-fix-possible-memory-leak-in-yam_init_driver.patch mksysmap-fix-the-mismatch-of-.l-symbols-in-system.ma.patch scsi-sr-fix-sr_probe-missing-deallocate-of-device-mi.patch scsi-ibmvscsi-don-t-send-host-info-in-adapter-info-m.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch alsa-usb-audio-improve-frames-size-computation.patch s390-qdio-put-thinint-indicator-after-early-error.patch tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch diff --git a/queue-4.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-4.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index 54807ce26aa..00000000000 --- a/queue-4.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From e57d07be798de1feb15dbfb69de95f11f42086ee Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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 d3ad89c7b8afd..f82bbbe82244f 100644 ---- a/drivers/staging/rtl8712/rtl871x_xmit.c -+++ b/drivers/staging/rtl8712/rtl871x_xmit.c -@@ -593,7 +593,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; -@@ -636,15 +636,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); -@@ -652,8 +650,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); --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 6070bf50251..5e2f82bafe7 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -23,7 +23,6 @@ yam-fix-possible-memory-leak-in-yam_init_driver.patch mksysmap-fix-the-mismatch-of-.l-symbols-in-system.ma.patch scsi-sr-fix-sr_probe-missing-deallocate-of-device-mi.patch scsi-ibmvscsi-don-t-send-host-info-in-adapter-info-m.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch alsa-usb-audio-improve-frames-size-computation.patch s390-qdio-put-thinint-indicator-after-early-error.patch tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch diff --git a/queue-4.9/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-4.9/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index 54dd9bd8912..00000000000 --- a/queue-4.9/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 70a87f1a8a9a6e3203d88dabf431b3a5592e51db Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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 c478639368587..c6a90251043e3 100644 ---- a/drivers/staging/rtl8712/rtl871x_xmit.c -+++ b/drivers/staging/rtl8712/rtl871x_xmit.c -@@ -599,7 +599,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; -@@ -642,15 +642,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); -@@ -658,8 +656,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); --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 786fd7d267e..6e2b2f0e41f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -82,7 +82,6 @@ scsi-ibmvscsi-don-t-send-host-info-in-adapter-info-m.patch apparmor-fix-nnp-subset-test-for-unconfined.patch x86-purgatory-disable-various-profiling-and-sanitizi.patch staging-greybus-fix-a-missing-check-bug-in-gb_lights.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch arm64-dts-mt8173-fix-unit-name-warnings.patch scsi-qedi-do-not-flush-offload-work-if-arp-not-resol.patch arm64-dts-qcom-msm8916-remove-unit-name-for-thermal-.patch diff --git a/queue-5.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-5.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index b64b269a933..00000000000 --- a/queue-5.4/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4414f3fe9f4743246fd86d77d38bd3ffc9a0b534 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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 cc5809e49e356..7a821921c0da1 100644 ---- a/drivers/staging/rtl8712/rtl871x_xmit.c -+++ b/drivers/staging/rtl8712/rtl871x_xmit.c -@@ -590,7 +590,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; -@@ -633,15 +633,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); -@@ -649,8 +647,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); --- -2.25.1 - diff --git a/queue-5.7/series b/queue-5.7/series index 5d3c0b10db5..596993931dc 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -113,7 +113,6 @@ x86-purgatory-disable-various-profiling-and-sanitizi.patch arm-dts-bcm283x-use-firmware-pm-driver-for-v3d.patch arm64-dts-realtek-rtd129x-fix-gic-cpu-masks-for-rtd1.patch staging-greybus-fix-a-missing-check-bug-in-gb_lights.patch -staging-rtl8712-fix-multiline-derefernce-warnings.patch staging-mt7621-pci-fix-pcie-interrupt-mapping.patch arm64-dts-mt8173-fix-unit-name-warnings.patch scsi-qedi-do-not-flush-offload-work-if-arp-not-resol.patch diff --git a/queue-5.7/staging-rtl8712-fix-multiline-derefernce-warnings.patch b/queue-5.7/staging-rtl8712-fix-multiline-derefernce-warnings.patch deleted file mode 100644 index c8273fdc128..00000000000 --- a/queue-5.7/staging-rtl8712-fix-multiline-derefernce-warnings.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bb6d6c722205376e66f08c8409d0ba4db5d9908b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Mar 2020 14:57:47 -0400 -Subject: staging: rtl8712: fix multiline derefernce warnings - -From: Aiman Najjar - -[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ] - -This patch fixes remaining checkpatch warnings -in rtl871x_xmit.c: - -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 -Reviewed-by: Dan Carpenter -Link: https://lore.kernel.org/r/98805a72b92e9bbf933e05b827d27944663b7bc1.1585508171.git.aiman.najjar@hurranet.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - 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 f0b85338b567c..57f4fd22b0ff5 100644 ---- a/drivers/staging/rtl8712/rtl871x_xmit.c -+++ b/drivers/staging/rtl8712/rtl871x_xmit.c -@@ -589,7 +589,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; -@@ -632,15 +632,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); -@@ -648,8 +646,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); --- -2.25.1 - -- 2.47.3