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

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

ath9k: rename symbols in enum ath9k_internal_frame_type to avoid confusion 



Symbols starting with "ATH9K_INT" are also used for interrupt mask.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b409894f

drivers/net/wireless/ath/ath9k/rc.h

+3 −3
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ struct ath_rate_priv { 
#define ATH_TX_INFO_UNDERRUN		(1 << 4)



enum ath9k_internal_frame_type {

	ATH9K_NOT_INTERNAL,

	ATH9K_INT_PAUSE,

	ATH9K_INT_UNPAUSE

	ATH9K_IFT_NOT_INTERNAL,

	ATH9K_IFT_PAUSE,

	ATH9K_IFT_UNPAUSE

};



int ath_rate_control_register(void);

drivers/net/wireless/ath/ath9k/virtual.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int ath9k_send_nullfunc(struct ath_wiphy *aphy, 


	memset(&txctl, 0, sizeof(struct ath_tx_control));

	txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO]];

	txctl.frame_type = ps ? ATH9K_INT_PAUSE : ATH9K_INT_UNPAUSE;

	txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;



	if (ath_tx_start(aphy->hw, skb, &txctl) != 0)

		goto exit;

drivers/net/wireless/ath/ath9k/xmit.c

+3 −3
Original line number Diff line number Diff line
@@ -1593,12 +1593,12 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, 


	tx_info->pad[0] = 0;

	switch (txctl->frame_type) {

	case ATH9K_NOT_INTERNAL:

	case ATH9K_IFT_NOT_INTERNAL:

		break;

	case ATH9K_INT_PAUSE:

	case ATH9K_IFT_PAUSE:

		tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_PAUSE;

		/* fall through */

	case ATH9K_INT_UNPAUSE:

	case ATH9K_IFT_UNPAUSE:

		tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_INTERNAL;

		break;

	}