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

Commit 53cb6700 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: remove unused ioctls (2) 



The ioctls

 * PRISM2_PARAM_STA_ANTENNA_SEL
 * PRISM2_PARAM_TX_POWER_REDUCTION
 * PRISM2_PARAM_DEFAULT_WEP_ONLY

are not used by hostapd or wpa_supplicant.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-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 b2446b36

include/net/mac80211.h

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ struct ieee80211_conf { 
	u8 power_level;			/* transmit power limit for current

					 * regulatory domain; in dBm */

	u8 antenna_max;			/* maximum antenna gain */

	short tx_power_reduction; /* in 0.1 dBm */



	/* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */

	u8 antenna_sel_tx;

net/mac80211/debugfs.c

+0 −5
Original line number Diff line number Diff line
@@ -110,9 +110,6 @@ DEBUGFS_READONLY_FILE(mode, 20, "%s", 
		      ieee80211_mode_str(local->hw.conf.phymode));

DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",

		      local->wep_iv & 0xffffff);

DEBUGFS_READONLY_FILE(tx_power_reduction, 20, "%d.%d dBm",

		      local->hw.conf.tx_power_reduction / 10,

		      local->hw.conf.tx_power_reduction % 10);

DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",

		      local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
@@ -317,7 +314,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	DEBUGFS_ADD(total_ps_buffered);

	DEBUGFS_ADD(mode);

	DEBUGFS_ADD(wep_iv);

	DEBUGFS_ADD(tx_power_reduction);

	DEBUGFS_ADD(modes);



	statsd = debugfs_create_dir("statistics", phyd);
@@ -382,7 +378,6 @@ void debugfs_hw_del(struct ieee80211_local *local) 
	DEBUGFS_DEL(total_ps_buffered);

	DEBUGFS_DEL(mode);

	DEBUGFS_DEL(wep_iv);

	DEBUGFS_DEL(tx_power_reduction);

	DEBUGFS_DEL(modes);



	DEBUGFS_STATS_DEL(transmitted_fragment_count);

net/mac80211/hostapd_ioctl.h

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

	PRISM2_PARAM_SHORT_SLOT_TIME = 1006,

	PRISM2_PARAM_NEXT_MODE = 1008,

	PRISM2_PARAM_STA_ANTENNA_SEL = 1017,

	PRISM2_PARAM_TX_POWER_REDUCTION = 1022,

	PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,

	PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,

	PRISM2_PARAM_WIFI_WME_NOACK_TEST = 1033,

	PRISM2_PARAM_SCAN_FLAGS = 1035,

	PRISM2_PARAM_HW_MODES = 1036,

net/mac80211/ieee80211_i.h

+0 −11
Original line number Diff line number Diff line
@@ -514,12 +514,6 @@ struct ieee80211_local { 
	struct work_struct sta_debugfs_add;

#endif



	enum {

		STA_ANTENNA_SEL_AUTO = 0,

		STA_ANTENNA_SEL_SW_CTRL = 1,

		STA_ANTENNA_SEL_SW_CTRL_DEBUG = 2

	} sta_antenna_sel;



#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

	/* TX/RX handler statistics */

	unsigned int tx_handlers_drop;
@@ -555,10 +549,6 @@ struct ieee80211_local { 
	int total_ps_buffered; /* total number of all buffered unicast and

				* multicast packets for power saving stations

				*/

	int allow_broadcast_always; /* whether to allow TX of broadcast frames

				     * even when there are no associated STAs

				     */



	int wifi_wme_noack_test;

	unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
@@ -585,7 +575,6 @@ struct ieee80211_local { 
		struct dentry *total_ps_buffered;

		struct dentry *mode;

		struct dentry *wep_iv;

		struct dentry *tx_power_reduction;

		struct dentry *modes;

		struct dentry *statistics;

		struct local_debugfsdentries_statsdentries {

net/mac80211/ieee80211_ioctl.c

+0 −27
Original line number Diff line number Diff line
@@ -1088,25 +1088,10 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev, 
		local->next_mode = value;

		break;



	case PRISM2_PARAM_STA_ANTENNA_SEL:

		local->sta_antenna_sel = value;

		break;



	case PRISM2_PARAM_TX_POWER_REDUCTION:

		if (value < 0)

			ret = -EINVAL;

		else

			local->hw.conf.tx_power_reduction = value;

		break;



	case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:

		local->key_tx_rx_threshold = value;

		break;



	case PRISM2_PARAM_DEFAULT_WEP_ONLY:

		ret = ieee80211_ioctl_default_wep_only(local, value);

		break;



	case PRISM2_PARAM_WIFI_WME_NOACK_TEST:

		local->wifi_wme_noack_test = value;

		break;
@@ -1187,22 +1172,10 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev, 
		*param = local->next_mode;

		break;



	case PRISM2_PARAM_STA_ANTENNA_SEL:

		*param = local->sta_antenna_sel;

		break;



	case PRISM2_PARAM_TX_POWER_REDUCTION:

		*param = local->hw.conf.tx_power_reduction;

		break;



	case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:

		*param = local->key_tx_rx_threshold;

		break;



	case PRISM2_PARAM_DEFAULT_WEP_ONLY:

		*param = local->default_wep_only;

		break;



	case PRISM2_PARAM_WIFI_WME_NOACK_TEST:

		*param = local->wifi_wme_noack_test;

		break;