8 files changed, 12 insertions, 54 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
index cf56ec8791ba..df549c96adef 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
@@ -618,13 +618,6 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL, from skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
-
                 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index c14012330900..2fb9c7acb76a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -389,10 +389,6 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (stats->decrypted) {
-                if (!hdr) {
-                        /* In testing, hdr was NULL here */
-                        return false;
-                }
                 if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
index 85d0d58079a6..dfdc9b20e4ad 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
@@ -530,18 +530,18 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         fac = (1 << (fac + 2));
                         if (fac > 0xf)
                                 fac = 0xf;
-                                for (i = 0; i < 4; i++) {
-                                        if ((reg[i] & 0xf0) > (fac << 4))
-                                                reg[i] = (reg[i] & 0x0f) |
-                                                        (fac << 4);
-                                        if ((reg[i] & 0x0f) > fac)
-                                                reg[i] = (reg[i] & 0xf0) | fac;
-                                                rtl_write_byte(rtlpriv,
-                                                       (REG_AGGLEN_LMT + i),
-                                                       reg[i]);
-                                }
-                                RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         "Set HW_VAR_AMPDU_FACTOR:%#x\n", fac);
+                        for (i = 0; i < 4; i++) {
+                                if ((reg[i] & 0xf0) > (fac << 4))
+                                        reg[i] = (reg[i] & 0x0f) |
+                                                (fac << 4);
+                                if ((reg[i] & 0x0f) > fac)
+                                        reg[i] = (reg[i] & 0xf0) | fac;
+                                rtl_write_byte(rtlpriv,
+                                               (REG_AGGLEN_LMT + i),
+                                               reg[i]);
+                        }
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
+                                 "Set HW_VAR_AMPDU_FACTOR:%#x\n", fac);
                 }
                 }
                 break;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
index 83edd9525e5e..2fcbef1d029f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
@@ -564,13 +564,6 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL, from skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
-
                 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 2b3c78baa9f8..b358ebce8942 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -312,10 +312,6 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
                 hdr = (struct ieee80211_hdr *)(skb->data +
                        stats->rx_drvinfo_size + stats->rx_bufshift);
 
-                if (!hdr) {
-                        /* during testing, hdr was NULL here */
-                        return false;
-                }
                 if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
                         (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index 1da2367ef37e..d372ccaf3465 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -491,12 +491,6 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL, from skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
                 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
index 9679cd207fad..d6a1c70cb657 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c
@@ -547,13 +547,6 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL, from skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
-
                 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
index 7ece0efc6d3b..383b86b05cba 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
@@ -755,13 +755,6 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,
          * to decrypt it
          */
         if (status->decrypted) {
-                if (!hdr) {
-                        WARN_ON_ONCE(true);
-                        pr_err("decrypted is true but hdr NULL, from skb %p\n",
-                               rtl_get_hdr(skb));
-                        return false;
-                }
-
                 if ((!_ieee80211_is_robust_mgmt_frame(hdr)) &&
                     (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag |= RX_FLAG_DECRYPTED;