diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-11 14:38:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-11 14:38:16 -0500 |
commit | 2071a0084a0323697b7d6fd5a98982194bd6929f (patch) | |
tree | cfa228cd187f600fd93b858b46e656bb24b0020e /drivers/net/wireless/ath/ath5k/base.c | |
parent | ff879eb611dba859c4349048a32789e8c82afa91 (diff) | |
parent | d01032e4fd33110f9f3a085a36cb819c1dfc5827 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 07c1e52b5a0c..cb3dc892d697 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -1146,7 +1146,6 @@ ath5k_mode_setup(struct ath5k_softc *sc) | |||
1146 | /* configure operational mode */ | 1146 | /* configure operational mode */ |
1147 | ath5k_hw_set_opmode(ah); | 1147 | ath5k_hw_set_opmode(ah); |
1148 | 1148 | ||
1149 | ath5k_hw_set_mcast_filter(ah, 0, 0); | ||
1150 | ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt); | 1149 | ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt); |
1151 | } | 1150 | } |
1152 | 1151 | ||