summaryrefslogtreecommitdiff
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-28 19:19:37 +0300
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 23:19:33 +0300
commit238814fd9a9624e3076c47ef0c003101927c7818 (patch)
tree634070fcdd922cc8992ecb52147d0efc3e3cf574 /net/mac80211/tx.c
parent69d464d5938ca0f4fb3447b3e32872e0ca79efc1 (diff)
downloadlinux-238814fd9a9624e3076c47ef0c003101927c7818.tar.xz
mac80211: remove port control enable switch, clean up sta flags
This patch removes the 802.1X port acess control enable flag since it is not required. Instead, set the authorized flag for each station that we normally communicate with (WDS peers, IBSS peers and APs we're associated to) and require hostapd to set the authorized flag for all stations when port control is not enabled. Also, since I was working in that area, this documents station flags and removes the unused "permanent" one. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 9e5359991985..2b4746441232 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1471,12 +1471,10 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
}
/*
- * If port access control is enabled, drop unicast frames to
- * unauthorised stations unless they are EAPOL frames from the
- * local station.
+ * Drop unicast frames to unauthorised stations unless they are
+ * EAPOL frames from the local station.
*/
- if (unlikely(sdata->ieee802_1x_pac &&
- !is_multicast_ether_addr(hdr.addr1) &&
+ if (unlikely(!is_multicast_ether_addr(hdr.addr1) &&
!(sta_flags & WLAN_STA_AUTHORIZED) &&
!(ethertype == ETH_P_PAE &&
compare_ether_addr(dev->dev_addr,