aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-08-28 17:01:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:48:58 -0700
commitc9ee23dfac61a713de48b20999dcacb7ef3c5ed0 (patch)
tree26b0f858fd48be3ff1b0ed4e4f968d6fb4e0a68b /net/mac80211/rx.c
parent52aa944a182545a987dc753f9602235a3359df0c (diff)
downloadkernel_samsung_espresso10-c9ee23dfac61a713de48b20999dcacb7ef3c5ed0.zip
kernel_samsung_espresso10-c9ee23dfac61a713de48b20999dcacb7ef3c5ed0.tar.gz
kernel_samsung_espresso10-c9ee23dfac61a713de48b20999dcacb7ef3c5ed0.tar.bz2
[MAC80211]: make assoc_ap a flag
The sta_info.assoc_ap value is used as a flag, move it into flags. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 75a1e20..4fb8c70 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1398,7 +1398,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
skb = rx.skb;
skb_push(skb, radiotap_len);
- if (sta && !sta->assoc_ap && !(sta->flags & WLAN_STA_WDS) &&
+ if (sta && !(sta->flags & (WLAN_STA_WDS | WLAN_STA_ASSOC_AP)) &&
!local->iff_promiscs && !is_multicast_ether_addr(hdr->addr1)) {
rx.flags |= IEEE80211_TXRXD_RXRA_MATCH;
ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,