aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>2012-09-27 08:49:50 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2012-10-24 04:49:56 -0400
commitc0b34e2b41cc29c15b4cf247727efdab6a864c1b (patch)
treef7f2afe131f6d9fb2164080021b694daa21aa71e
parent5dbdf6feecad54b739cb7a5cff521fba86cabba5 (diff)
ath6kl: Rename ATH6KL_HW_FLAG_64BIT_RATES
Rename ATH6KL_HW_FLAG_64BIT_RATES to ATH6KL_HW_64BIT_RATES. This seemed to be necessary to add/use new hardware flags without exceeding 80 lines. We shall be adding new hw flags dropping the FLAG term. Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c2
-rw-r--r--drivers/net/wireless/ath/ath6kl/core.h2
-rw-r--r--drivers/net/wireless/ath/ath6kl/init.c8
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 530eede4f5e..6d143e453f9 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3708,7 +3708,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
3708 ath6kl_band_5ghz.ht_cap.ht_supported = false; 3708 ath6kl_band_5ghz.ht_cap.ht_supported = false;
3709 } 3709 }
3710 3710
3711 if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES) { 3711 if (ar->hw.flags & ATH6KL_HW_64BIT_RATES) {
3712 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff; 3712 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
3713 ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff; 3713 ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
3714 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff; 3714 ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 3b2dfc18085..fc5e4b25818 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -149,7 +149,7 @@ struct ath6kl_fw_ie {
149}; 149};
150 150
151enum ath6kl_hw_flags { 151enum ath6kl_hw_flags {
152 ATH6KL_HW_FLAG_64BIT_RATES = BIT(0), 152 ATH6KL_HW_64BIT_RATES = BIT(0),
153}; 153};
154 154
155#define ATH6KL_FW_API2_FILE "fw-2.bin" 155#define ATH6KL_FW_API2_FILE "fw-2.bin"
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 424676e06b3..18550c51e12 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -93,7 +93,7 @@ static const struct ath6kl_hw hw_list[] = {
93 .board_addr = 0x433900, 93 .board_addr = 0x433900,
94 .refclk_hz = 26000000, 94 .refclk_hz = 26000000,
95 .uarttx_pin = 11, 95 .uarttx_pin = 11,
96 .flags = ATH6KL_HW_FLAG_64BIT_RATES, 96 .flags = ATH6KL_HW_64BIT_RATES,
97 97
98 .fw = { 98 .fw = {
99 .dir = AR6004_HW_1_0_FW_DIR, 99 .dir = AR6004_HW_1_0_FW_DIR,
@@ -113,7 +113,7 @@ static const struct ath6kl_hw hw_list[] = {
113 .board_addr = 0x43d400, 113 .board_addr = 0x43d400,
114 .refclk_hz = 40000000, 114 .refclk_hz = 40000000,
115 .uarttx_pin = 11, 115 .uarttx_pin = 11,
116 .flags = ATH6KL_HW_FLAG_64BIT_RATES, 116 .flags = ATH6KL_HW_64BIT_RATES,
117 117
118 .fw = { 118 .fw = {
119 .dir = AR6004_HW_1_1_FW_DIR, 119 .dir = AR6004_HW_1_1_FW_DIR,
@@ -133,7 +133,7 @@ static const struct ath6kl_hw hw_list[] = {
133 .board_addr = 0x435c00, 133 .board_addr = 0x435c00,
134 .refclk_hz = 40000000, 134 .refclk_hz = 40000000,
135 .uarttx_pin = 11, 135 .uarttx_pin = 11,
136 .flags = ATH6KL_HW_FLAG_64BIT_RATES, 136 .flags = ATH6KL_HW_64BIT_RATES,
137 137
138 .fw = { 138 .fw = {
139 .dir = AR6004_HW_1_2_FW_DIR, 139 .dir = AR6004_HW_1_2_FW_DIR,
@@ -152,7 +152,7 @@ static const struct ath6kl_hw hw_list[] = {
152 .board_addr = 0x436400, 152 .board_addr = 0x436400,
153 .refclk_hz = 40000000, 153 .refclk_hz = 40000000,
154 .uarttx_pin = 11, 154 .uarttx_pin = 11,
155 .flags = ATH6KL_HW_FLAG_64BIT_RATES, 155 .flags = ATH6KL_HW_64BIT_RATES,
156 156
157 .fw = { 157 .fw = {
158 .dir = AR6004_HW_1_3_FW_DIR, 158 .dir = AR6004_HW_1_3_FW_DIR,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index f3aeebb2fd4..55ccf977033 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -2828,7 +2828,7 @@ int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
2828{ 2828{
2829 struct ath6kl *ar = wmi->parent_dev; 2829 struct ath6kl *ar = wmi->parent_dev;
2830 2830
2831 if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES) 2831 if (ar->hw.flags & ATH6KL_HW_64BIT_RATES)
2832 return ath6kl_set_bitrate_mask64(wmi, if_idx, mask); 2832 return ath6kl_set_bitrate_mask64(wmi, if_idx, mask);
2833 else 2833 else
2834 return ath6kl_set_bitrate_mask32(wmi, if_idx, mask); 2834 return ath6kl_set_bitrate_mask32(wmi, if_idx, mask);