diff options
| author | Michael Wu <flamingice@sourmilk.net> | 2007-10-12 22:45:12 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-10-18 21:42:52 +0200 |
| commit | 4771afb56930d6b03a04fa231f06ae29c3a496de (patch) | |
| tree | ced284cb9f43fd02876eb1e2aefb0bbb521473b5 /drivers/net/wireless/rtl8187_dev.c | |
| parent | [PATCH] janitorial: fix all double includes in drivers/net/wireless (diff) | |
| download | linux-4771afb56930d6b03a04fa231f06ae29c3a496de.tar.xz linux-4771afb56930d6b03a04fa231f06ae29c3a496de.zip | |
[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>
Diffstat (limited to 'drivers/net/wireless/rtl8187_dev.c')
| -rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 805b2af50afc..de61c8fe6492 100644 --- 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) |