aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-28 11:19:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:19:33 -0500
commit238814fd9a9624e3076c47ef0c003101927c7818 (patch)
tree634070fcdd922cc8992ecb52147d0efc3e3cf574 /net/mac80211/rx.c
parent69d464d5938ca0f4fb3447b3e32872e0ca79efc1 (diff)
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/rx.c')
-rw-r--r--net/mac80211/rx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c9ff98a93211..0989c212b7c2 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -987,11 +987,11 @@ ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx)
987static int 987static int
988ieee80211_802_1x_port_control(struct ieee80211_txrx_data *rx) 988ieee80211_802_1x_port_control(struct ieee80211_txrx_data *rx)
989{ 989{
990 if (unlikely(rx->sdata->ieee802_1x_pac && 990 if (unlikely(!rx->sta || !(rx->sta->flags & WLAN_STA_AUTHORIZED))) {
991 (!rx->sta || !(rx->sta->flags & WLAN_STA_AUTHORIZED)))) {
992#ifdef CONFIG_MAC80211_DEBUG 991#ifdef CONFIG_MAC80211_DEBUG
993 printk(KERN_DEBUG "%s: dropped frame " 992 if (net_ratelimit())
994 "(unauthorized port)\n", rx->dev->name); 993 printk(KERN_DEBUG "%s: dropped frame "
994 "(unauthorized port)\n", rx->dev->name);
995#endif /* CONFIG_MAC80211_DEBUG */ 995#endif /* CONFIG_MAC80211_DEBUG */
996 return -EACCES; 996 return -EACCES;
997 } 997 }