diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 07:43:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 07:43:03 +0100 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/wireless/ath5k/base.c | |
| parent | pkt_sched: Fix qdisc len in qdisc_peek_dequeued() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.xz linux-9eeda9abd1faf489f3df9a1f557975f4c8650363.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 7ac5f2847da5..6f368e8cdf17 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -2949,8 +2949,10 @@ 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_ADHOC) + if (sc->opmode == NL80211_IFTYPE_STATION || + sc->opmode == NL80211_IFTYPE_ADHOC) { rfilt |= AR5K_RX_FILTER_BEACON; + } if (sc->opmode == NL80211_IFTYPE_MESH_POINT) rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON | AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM; |