Commit 238814fd authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 69d464d5

net/mac80211/debugfs_netdev.c

+0 −9
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static const struct file_operations name##_ops = { \ 
/* common attributes */

IEEE80211_IF_FILE(channel_use, channel_use, DEC);

IEEE80211_IF_FILE(drop_unencrypted, drop_unencrypted, DEC);

IEEE80211_IF_FILE(ieee802_1x_pac, ieee802_1x_pac, DEC);



/* STA/IBSS attributes */

IEEE80211_IF_FILE(state, u.sta.state, DEC);
@@ -148,7 +147,6 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_ADD(channel_use, sta);

	DEBUGFS_ADD(drop_unencrypted, sta);

	DEBUGFS_ADD(ieee802_1x_pac, sta);

	DEBUGFS_ADD(state, sta);

	DEBUGFS_ADD(bssid, sta);

	DEBUGFS_ADD(prev_bssid, sta);
@@ -169,7 +167,6 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_ADD(channel_use, ap);

	DEBUGFS_ADD(drop_unencrypted, ap);

	DEBUGFS_ADD(ieee802_1x_pac, ap);

	DEBUGFS_ADD(num_sta_ps, ap);

	DEBUGFS_ADD(dtim_count, ap);

	DEBUGFS_ADD(num_beacons, ap);
@@ -182,7 +179,6 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_ADD(channel_use, wds);

	DEBUGFS_ADD(drop_unencrypted, wds);

	DEBUGFS_ADD(ieee802_1x_pac, wds);

	DEBUGFS_ADD(peer, wds);

}
@@ -190,7 +186,6 @@ static void add_vlan_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_ADD(channel_use, vlan);

	DEBUGFS_ADD(drop_unencrypted, vlan);

	DEBUGFS_ADD(ieee802_1x_pac, vlan);

}



static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
@@ -234,7 +229,6 @@ static void del_sta_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_DEL(channel_use, sta);

	DEBUGFS_DEL(drop_unencrypted, sta);

	DEBUGFS_DEL(ieee802_1x_pac, sta);

	DEBUGFS_DEL(state, sta);

	DEBUGFS_DEL(bssid, sta);

	DEBUGFS_DEL(prev_bssid, sta);
@@ -255,7 +249,6 @@ static void del_ap_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_DEL(channel_use, ap);

	DEBUGFS_DEL(drop_unencrypted, ap);

	DEBUGFS_DEL(ieee802_1x_pac, ap);

	DEBUGFS_DEL(num_sta_ps, ap);

	DEBUGFS_DEL(dtim_count, ap);

	DEBUGFS_DEL(num_beacons, ap);
@@ -268,7 +261,6 @@ static void del_wds_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_DEL(channel_use, wds);

	DEBUGFS_DEL(drop_unencrypted, wds);

	DEBUGFS_DEL(ieee802_1x_pac, wds);

	DEBUGFS_DEL(peer, wds);

}
@@ -276,7 +268,6 @@ static void del_vlan_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_DEL(channel_use, vlan);

	DEBUGFS_DEL(drop_unencrypted, vlan);

	DEBUGFS_DEL(ieee802_1x_pac, vlan);

}



static void del_monitor_files(struct ieee80211_sub_if_data *sdata)

net/mac80211/debugfs_sta.c

+1 −2
Original line number Diff line number Diff line
@@ -74,12 +74,11 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, 
{

	char buf[100];

	struct sta_info *sta = file->private_data;

	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",

	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",

		sta->flags & WLAN_STA_AUTH ? "AUTH\n" : "",

		sta->flags & WLAN_STA_ASSOC ? "ASSOC\n" : "",

		sta->flags & WLAN_STA_PS ? "PS\n" : "",

		sta->flags & WLAN_STA_TIM ? "TIM\n" : "",

		sta->flags & WLAN_STA_PERM ? "PERM\n" : "",

		sta->flags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",

		sta->flags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",

		sta->flags & WLAN_STA_WME ? "WME\n" : "",

net/mac80211/ieee80211.c

+3 −0
Original line number Diff line number Diff line
@@ -804,6 +804,9 @@ int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr) 
	sta = sta_info_add(local, dev, remote_addr, GFP_KERNEL);

	if (!sta)

		return -ENOMEM;



	sta->flags |= WLAN_STA_AUTHORIZED;



	sta_info_put(sta);



	/* Remove STA entry for the old peer */

net/mac80211/ieee80211_i.h

+0 −9
Original line number Diff line number Diff line
@@ -305,11 +305,6 @@ struct ieee80211_sub_if_data { 
	unsigned int flags;



	int drop_unencrypted;

	/*

	 * IEEE 802.1X Port access control in effect,

	 * drop packets to/from unauthorized port

	 */

	int ieee802_1x_pac;



	/*

	 * basic rates of this AP or the AP we're associated to
@@ -352,7 +347,6 @@ struct ieee80211_sub_if_data { 
		struct {

			struct dentry *channel_use;

			struct dentry *drop_unencrypted;

			struct dentry *ieee802_1x_pac;

			struct dentry *state;

			struct dentry *bssid;

			struct dentry *prev_bssid;
@@ -371,7 +365,6 @@ struct ieee80211_sub_if_data { 
		struct {

			struct dentry *channel_use;

			struct dentry *drop_unencrypted;

			struct dentry *ieee802_1x_pac;

			struct dentry *num_sta_ps;

			struct dentry *dtim_count;

			struct dentry *num_beacons;
@@ -382,13 +375,11 @@ struct ieee80211_sub_if_data { 
		struct {

			struct dentry *channel_use;

			struct dentry *drop_unencrypted;

			struct dentry *ieee802_1x_pac;

			struct dentry *peer;

		} wds;

		struct {

			struct dentry *channel_use;

			struct dentry *drop_unencrypted;

			struct dentry *ieee802_1x_pac;

		} vlan;

		struct {

			struct dentry *mode;

net/mac80211/ieee80211_sta.c

+4 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
	}



	sta->dev = dev;

	sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_ASSOC_AP;

	sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_ASSOC_AP |

		      WLAN_STA_AUTHORIZED;



	rates = 0;

	basic_rates = 0;
@@ -3791,6 +3792,8 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, 
	if (!sta)

		return NULL;



	sta->flags |= WLAN_STA_AUTHORIZED;



	sta->supp_rates[local->hw.conf.channel->band] =

		sdata->u.sta.supp_rates_bits[local->hw.conf.channel->band];