Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011bfcc4 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: remove key threshold stuff 



This patch removes the key threshold stuff from mac80211.
I have patches for later that add it as a per-key setting
to nl/cfg80211.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72abd81b

net/mac80211/debugfs.c

+0 −4
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d", 
		      local->hw.conf.antenna_sel_rx);

DEBUGFS_READONLY_FILE(bridge_packets, 20, "%d",

		      local->bridge_packets);

DEBUGFS_READONLY_FILE(key_tx_rx_threshold, 20, "%d",

		      local->key_tx_rx_threshold);

DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",

		      local->rts_threshold);

DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d",
@@ -301,7 +299,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	DEBUGFS_ADD(antenna_sel_tx);

	DEBUGFS_ADD(antenna_sel_rx);

	DEBUGFS_ADD(bridge_packets);

	DEBUGFS_ADD(key_tx_rx_threshold);

	DEBUGFS_ADD(rts_threshold);

	DEBUGFS_ADD(fragmentation_threshold);

	DEBUGFS_ADD(short_retry_limit);
@@ -364,7 +361,6 @@ void debugfs_hw_del(struct ieee80211_local *local) 
	DEBUGFS_DEL(antenna_sel_tx);

	DEBUGFS_DEL(antenna_sel_rx);

	DEBUGFS_DEL(bridge_packets);

	DEBUGFS_DEL(key_tx_rx_threshold);

	DEBUGFS_DEL(rts_threshold);

	DEBUGFS_DEL(fragmentation_threshold);

	DEBUGFS_DEL(short_retry_limit);

net/mac80211/hostapd_ioctl.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ enum { 
	PRISM2_PARAM_PREAMBLE = 1003,

	PRISM2_PARAM_SHORT_SLOT_TIME = 1006,

	PRISM2_PARAM_NEXT_MODE = 1008,

	PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,

	PRISM2_PARAM_WIFI_WME_NOACK_TEST = 1033,

	PRISM2_PARAM_SCAN_FLAGS = 1035,

	PRISM2_PARAM_HW_MODES = 1036,

net/mac80211/ieee80211.c

+0 −35
Original line number Diff line number Diff line
@@ -189,41 +189,6 @@ ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb, 
	netif_rx(skb);

}



void ieee80211_key_threshold_notify(struct net_device *dev,

				    struct ieee80211_key *key,

				    struct sta_info *sta)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct sk_buff *skb;

	struct ieee80211_msg_key_notification *msg;



	/* if no one will get it anyway, don't even allocate it.

	 * unlikely because this is only relevant for APs

	 * where the device must be open... */

	if (unlikely(!local->apdev))

		return;



	skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +

			    sizeof(struct ieee80211_msg_key_notification));

	if (!skb)

		return;



	skb_reserve(skb, sizeof(struct ieee80211_frame_info));

	msg = (struct ieee80211_msg_key_notification *)

		skb_put(skb, sizeof(struct ieee80211_msg_key_notification));

	msg->tx_rx_count = key->tx_rx_count;

	memcpy(msg->ifname, dev->name, IFNAMSIZ);

	if (sta)

		memcpy(msg->addr, sta->addr, ETH_ALEN);

	else

		memset(msg->addr, 0xff, ETH_ALEN);



	key->tx_rx_count = 0;



	ieee80211_rx_mgmt(local, skb, NULL,

			  ieee80211_msg_key_threshold_notification);

}



static int ieee80211_mgmt_open(struct net_device *dev)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

net/mac80211/ieee80211_common.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum ieee80211_msg_type { 
	/* hole at 6, was monitor but never sent to userspace */

	ieee80211_msg_sta_not_assoc = 7,

	/* 8 was ieee80211_msg_set_aid_for_sta */

	ieee80211_msg_key_threshold_notification = 9,

	/* 9 was ieee80211_msg_key_threshold_notification */

	/* 11 was ieee80211_msg_radar */

};

net/mac80211/ieee80211_i.h

+0 −7
Original line number Diff line number Diff line
@@ -465,9 +465,6 @@ struct ieee80211_local { 
	struct crypto_blkcipher *wep_tx_tfm;

	struct crypto_blkcipher *wep_rx_tfm;

	u32 wep_iv;

	int key_tx_rx_threshold; /* number of times any key can be used in TX

				  * or RX before generating a rekey

				  * notification; 0 = notification disabled. */



	int bridge_packets; /* bridge packets between associated stations and

			     * deliver multicast frames both back to wireless
@@ -573,7 +570,6 @@ struct ieee80211_local { 
		struct dentry *antenna_sel_tx;

		struct dentry *antenna_sel_rx;

		struct dentry *bridge_packets;

		struct dentry *key_tx_rx_threshold;

		struct dentry *rts_threshold;

		struct dentry *fragmentation_threshold;

		struct dentry *short_retry_limit;
@@ -724,9 +720,6 @@ void ieee80211_if_setup(struct net_device *dev); 
void ieee80211_if_mgmt_setup(struct net_device *dev);

struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local,

					  int phymode, int hwrate);

void ieee80211_key_threshold_notify(struct net_device *dev,

				    struct ieee80211_key *key,

				    struct sta_info *sta);



/* ieee80211_ioctl.c */

extern const struct iw_handler_def ieee80211_iw_handler_def;