From c30d0a6817bce5aa7f56c0b69f8d72e43bcdcbdf Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 15 Dec 2010 06:07:56 -0800 Subject: [PATCH] --- yaml --- r: 225521 b: refs/heads/master c: bdb84fec61aab7047b1b108b6b6824c003bc4d11 h: refs/heads/master i: 225519: e92c907bdb42b416a71027527613f2cd3e4fbb17 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc6bf81272f0..f09a4d2441a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e88735d711948a580741fd337afd4ec11c395174 +refs/heads/master: bdb84fec61aab7047b1b108b6b6824c003bc4d11 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index d4075476670a..b54d74daaea4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3634,7 +3634,8 @@ void iwlagn_configure_filter(struct ieee80211_hw *hw, changed_flags, *total_flags); CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK); - CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK); + /* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */ + CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK); CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK); #undef CHK