Commit e8f4fb7c authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove drop_unencrypted code 



This mechanism was historic, and only ever used by IBSS, which
also doesn't need to have it as it properly manages station's
802.1X PAE state (or, with WEP, always has a key.)

Remove the mechanism to clean up the code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c7ef38e0

net/mac80211/debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -274,8 +274,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

	DEBUGFS_STATS_ADD(tx_handlers_drop, local->tx_handlers_drop);

	DEBUGFS_STATS_ADD(tx_handlers_queued, local->tx_handlers_queued);

	DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted,

		local->tx_handlers_drop_unencrypted);

	DEBUGFS_STATS_ADD(tx_handlers_drop_fragment,

		local->tx_handlers_drop_fragment);

	DEBUGFS_STATS_ADD(tx_handlers_drop_wep,

net/mac80211/debugfs_netdev.c

+0 −2
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static ssize_t ieee80211_if_write_##name(struct file *file, \ 
	IEEE80211_IF_FILE_R(name)



/* common attributes */

IEEE80211_IF_FILE(drop_unencrypted, drop_unencrypted, DEC);

IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],

		  HEX);

IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
@@ -562,7 +561,6 @@ IEEE80211_IF_FILE(dot11MeshAwakeWindowDuration, 


static void add_common_files(struct ieee80211_sub_if_data *sdata)

{

	DEBUGFS_ADD(drop_unencrypted);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

net/mac80211/ibss.c

+0 −4
Original line number Diff line number Diff line
@@ -249,8 +249,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	if (presp)

		kfree_rcu(presp, rcu_head);



	sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;



	/* make a copy of the chandef, it could be modified below. */

	chandef = *req_chandef;

	chan = chandef.chan;
@@ -1303,8 +1301,6 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) 


	if (ifibss->privacy)

		capability |= WLAN_CAPABILITY_PRIVACY;

	else

		sdata->drop_unencrypted = 0;



	__ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,

				  &ifibss->chandef, ifibss->basic_rates,

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -818,8 +818,6 @@ struct ieee80211_sub_if_data { 


	unsigned long state;



	int drop_unencrypted;



	char name[IFNAMSIZ];



	/* Fragment table for host-based reassembly */
@@ -1262,7 +1260,6 @@ struct ieee80211_local { 
	/* TX/RX handler statistics */

	unsigned int tx_handlers_drop;

	unsigned int tx_handlers_queued;

	unsigned int tx_handlers_drop_unencrypted;

	unsigned int tx_handlers_drop_fragment;

	unsigned int tx_handlers_drop_wep;

	unsigned int tx_handlers_drop_not_assoc;

net/mac80211/iface.c

+0 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, 
	}



	/* reset some values that shouldn't be kept across type changes */

	sdata->drop_unencrypted = 0;

	if (type == NL80211_IFTYPE_STATION)

		sdata->u.mgd.use_4addr = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE