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: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h
index 36083dde863d..3d8d40cdc99e 100644
--- a/drivers/net/wireless/ath/ath9k/rc.h
+++ b/drivers/net/wireless/ath/ath9k/rc.h
@@ -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);
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c
index a43fbf84dab9..e95aaa3f18f3 100644
--- a/drivers/net/wireless/ath/ath9k/virtual.c
+++ b/drivers/net/wireless/ath/ath9k/virtual.c
@@ -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;
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 1d04ca86df56..b632c803ee1a 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -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;
         }