diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-30 23:35:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-30 23:35:23 -0700 |
| commit | 19b8cba2e8539e3b8022316f94837d8f242b8f80 (patch) | |
| tree | 9107cfa055ce927a3fdbb706e04ef2481faeb410 /drivers/net/wireless/ath5k/base.c | |
| parent | 263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df (diff) | |
| parent | adef199c61a224703dfa95c69d360c793ab2ea97 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index cfd4d052d666..9e47d727e220 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -2942,10 +2942,8 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, sc->opmode != NL80211_IFTYPE_MESH_POINT && test_bit(ATH_STAT_PROMISC, sc->status)) rfilt |= AR5K_RX_FILTER_PROM; - if (sc->opmode == NL80211_IFTYPE_STATION || - sc->opmode == NL80211_IFTYPE_ADHOC) { + if (sc->opmode == NL80211_IFTYPE_ADHOC) rfilt |= AR5K_RX_FILTER_BEACON; - } /* Set filters */ ath5k_hw_set_rx_filter(ah,rfilt); |