[PATCH] rtl8187: remove NICMAC setting in configure_filters callback

NICMAC should always be set.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 805b2af50afc4d68c93ab1051af5e4cd94eae3a6..de61c8fe64924dd52fb2e4e37dd6aacd5d00db04 100644 (file)
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -588,8 +588,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
 
        *total_flags = 0;
 
-       if (changed_flags & FIF_PROMISC_IN_BSS)
-               priv->rx_conf ^= RTL818X_RX_CONF_NICMAC;
        if (changed_flags & FIF_ALLMULTI)
                priv->rx_conf ^= RTL818X_RX_CONF_MULTICAST;
        if (changed_flags & FIF_FCSFAIL)
@@ -602,8 +600,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
        if (mc_count > 0)
                priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
 
-       if (priv->rx_conf & RTL818X_RX_CONF_NICMAC)
-               *total_flags |= FIF_PROMISC_IN_BSS;
        if (priv->rx_conf & RTL818X_RX_CONF_MULTICAST)
                *total_flags |= FIF_ALLMULTI;
        if (priv->rx_conf & RTL818X_RX_CONF_FCS)