From 87d8f8cf90cfa9066ffb018c813c194d05c38ac0 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Fri, 12 Oct 2007 16:45:12 -0400 Subject: [PATCH] --- yaml --- r: 71805 b: refs/heads/master c: 4771afb56930d6b03a04fa231f06ae29c3a496de h: refs/heads/master i: 71803: 5c1de2dd7fe68fd23b70153dd5d546c2402d2f98 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtl8187_dev.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1f1172f4e6bc..02029596f990 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90ba931fa1d3410c87d93ef774624d12533f37c3 +refs/heads/master: 4771afb56930d6b03a04fa231f06ae29c3a496de diff --git a/trunk/drivers/net/wireless/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl8187_dev.c index 805b2af50afc..de61c8fe6492 100644 --- a/trunk/drivers/net/wireless/rtl8187_dev.c +++ b/trunk/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)