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

Commit 8d44a823 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: remove most references to XR 



XR is a proprietary feature of the chipset.  It's not supported and
should not be supported.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2972cc18

drivers/net/wireless/ath/ath5k/ath5k.h

+0 −4
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ enum ath5k_driver_mode { 
	AR5K_MODE_11A		=	0,

	AR5K_MODE_11B		=	1,

	AR5K_MODE_11G		=	2,

	AR5K_MODE_XR		=	0,

	AR5K_MODE_MAX		=	3

};
@@ -694,12 +693,10 @@ struct ath5k_gain { 
#define	CHANNEL_5GHZ	0x0100	/* 5GHz channel */

#define	CHANNEL_PASSIVE	0x0200	/* Only passive scan allowed */

#define	CHANNEL_DYN	0x0400	/* Dynamic CCK-OFDM channel (for g operation) */

#define	CHANNEL_XR	0x0800	/* XR channel */



#define	CHANNEL_A	(CHANNEL_5GHZ | CHANNEL_OFDM)

#define	CHANNEL_B	(CHANNEL_2GHZ | CHANNEL_CCK)

#define	CHANNEL_G	(CHANNEL_2GHZ | CHANNEL_OFDM)

#define	CHANNEL_X	(CHANNEL_5GHZ | CHANNEL_OFDM | CHANNEL_XR)



#define	CHANNEL_ALL	(CHANNEL_OFDM | CHANNEL_CCK | \

			 CHANNEL_2GHZ | CHANNEL_5GHZ)
@@ -710,7 +707,6 @@ struct ath5k_gain { 
 * Used internally for ath5k_hw_reset_tx_queue().

 * Also see struct struct ieee80211_channel.

 */

#define IS_CHAN_XR(_c)	((_c->hw_value & CHANNEL_XR) != 0)

#define IS_CHAN_B(_c)	((_c->hw_value & CHANNEL_B) != 0)



/*

drivers/net/wireless/ath/ath5k/eeprom.c

+0 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,6 @@ ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel) 
{

	switch (channel->hw_value & CHANNEL_MODES) {

	case CHANNEL_A:

	case CHANNEL_XR:

		return AR5K_EEPROM_MODE_11A;

	case CHANNEL_G:

		return AR5K_EEPROM_MODE_11G;

drivers/net/wireless/ath/ath5k/phy.c

+0 −2
Original line number Diff line number Diff line
@@ -2408,8 +2408,6 @@ ath5k_get_max_ctl_power(struct ath5k_hw *ah, 
	case CHANNEL_B:

		ctl_mode |= AR5K_CTL_11B;

		break;

	case CHANNEL_XR:

		/* Fall through */

	default:

		return;

	}

drivers/net/wireless/ath/ath5k/qcu.c

+0 −7
Original line number Diff line number Diff line
@@ -185,13 +185,6 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type, 
		case AR5K_TX_QUEUE_CAB:

			queue = AR5K_TX_QUEUE_ID_CAB;

			break;

		case AR5K_TX_QUEUE_XR_DATA:

			if (ah->ah_version != AR5K_AR5212)

				ATH5K_ERR(ah,

					"XR data queues only supported in"

					" 5212!\n");

			queue = AR5K_TX_QUEUE_ID_XR_DATA;

			break;

		default:

			return -EINVAL;

		}

drivers/net/wireless/ath/ath5k/reset.c

+0 −8
Original line number Diff line number Diff line
@@ -1108,14 +1108,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, 


		mode = AR5K_MODE_11B;

		break;

	case CHANNEL_XR:

		if (ah->ah_version == AR5K_AR5211) {

			ATH5K_ERR(ah,

				"XR mode not available on 5211");

			return -EINVAL;

		}

		mode = AR5K_MODE_XR;

		break;

	default:

		ATH5K_ERR(ah,

			"invalid channel: %d\n", channel->center_freq);