rtlwifi: properly apply filter flags

commit 0baa0fd76f3f5a134461d6cf30294f6bb1bb824c
("rtlwifi: Convert core routines for addition of rtl8192se and
rtl8192de") removed setting HW_VAR_RCR, HW_VAR_MGT_FILTER and
HW_VAR_CTRL_FILTER. The last two are probably done because some hardware
does not support them. The first is probably a mistake. This patch adds
the missing set_hw_reg call.

For PCI support, rx_conf is not touched directly. Instead, get_hw_reg is
used to abstract between receive_config (for PCI) and rx_conf (for USB).

This was tested on a 10ec:8176 Realtek RTL8188CE (according to the
label on the mini-PCIe card). Before this patch, `iw wlan0 set monitor
otherbss` did not capture frames from other BSS's. After this patch, it
does print packets.

Tested-by: Peter Wu <lekensteyn@gmail.com>
Signed-off-by: Peter Wu <lekensteyn@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 30 insertions, 22 deletions

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 2d337a0c3df0..6df4df090b73 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -475,20 +475,40 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+        u32 rx_conf;
 
         *new_flags &= RTL_SUPPORTED_FILTERS;
         if (!changed_flags)
                 return;
 
+        /* if ssid not set to hw don't check bssid
+         * here just used for linked scanning, & linked
+         * and nolink check bssid is set in set network_type */
+        if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
+                (mac->link_state >= MAC80211_LINKED)) {
+                if (mac->opmode != NL80211_IFTYPE_AP &&
+                    mac->opmode != NL80211_IFTYPE_MESH_POINT) {
+                        if (*new_flags & FIF_BCN_PRBRESP_PROMISC) {
+                                rtlpriv->cfg->ops->set_chk_bssid(hw, false);
+                        } else {
+                                rtlpriv->cfg->ops->set_chk_bssid(hw, true);
+                        }
+                }
+        }
+
+        /* must be called after set_chk_bssid since that function modifies the
+         * RCR register too. */
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&rx_conf));
+
         /*TODO: we disable broadcase now, so enable here */
         if (changed_flags & FIF_ALLMULTI) {
                 if (*new_flags & FIF_ALLMULTI) {
-                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
+                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
                             rtlpriv->cfg->maps[MAC_RCR_AB];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive multicast frame\n");
                 } else {
-                        mac->rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
+                        rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
                                           rtlpriv->cfg->maps[MAC_RCR_AB]);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive multicast frame\n");
@@ -497,39 +517,25 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
 
         if (changed_flags & FIF_FCSFAIL) {
                 if (*new_flags & FIF_FCSFAIL) {
-                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
+                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive FCS error frame\n");
                 } else {
-                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
+                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive FCS error frame\n");
                 }
         }
 
-        /* if ssid not set to hw don't check bssid
-         * here just used for linked scanning, & linked
-         * and nolink check bssid is set in set network_type */
-        if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
-                (mac->link_state >= MAC80211_LINKED)) {
-                if (mac->opmode != NL80211_IFTYPE_AP &&
-                    mac->opmode != NL80211_IFTYPE_MESH_POINT) {
-                        if (*new_flags & FIF_BCN_PRBRESP_PROMISC) {
-                                rtlpriv->cfg->ops->set_chk_bssid(hw, false);
-                        } else {
-                                rtlpriv->cfg->ops->set_chk_bssid(hw, true);
-                        }
-                }
-        }
 
         if (changed_flags & FIF_CONTROL) {
                 if (*new_flags & FIF_CONTROL) {
-                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
+                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive control frame\n");
                 } else {
-                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
+                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive control frame\n");
                 }
@@ -537,15 +543,17 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
 
         if (changed_flags & FIF_OTHER_BSS) {
                 if (*new_flags & FIF_OTHER_BSS) {
-                        mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
+                        rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Enable receive other BSS's frame\n");
                 } else {
-                        mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
+                        rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
                                  "Disable receive other BSS's frame\n");
                 }
         }
+
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&rx_conf));
 }
 static int rtl_op_sta_add(struct ieee80211_hw *hw,
                          struct ieee80211_vif *vif,