Signed-off-by: Tomislav Po?ega <[email protected]>
---
drivers/net/wireless/ath/regd.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 75ddaef..8d5a16b 100644
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -28,7 +28,6 @@ enum ctl_group {
CTL_ETSI = 0x30,
};
-#define NO_CTL 0xff
#define SD_NO_CTL 0xE0
#define NO_CTL 0xff
#define CTL_11A 0
--
1.7.0.4
AR9330, AR9485, AR9531, AR9550, AR9561 and AR9565 all use same
channel set register configuration which allows for small code
size reduction.
Signed-off-by: Tomislav Po?ega <[email protected]>
---
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 98c5f52..daf30f9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -157,7 +157,9 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
freq = centers.synth_center;
if (freq < 4800) { /* 2 GHz, fractional mode */
- if (AR_SREV_9330(ah)) {
+ if (AR_SREV_9330(ah) || AR_SREV_9485(ah) ||
+ AR_SREV_9531(ah) || AR_SREV_9550(ah) ||
+ AR_SREV_9561(ah) || AR_SREV_9565(ah)) {
if (ah->is_clk_25mhz)
div = 75;
else
@@ -166,16 +168,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
channelSel = (freq * 4) / div;
chan_frac = (((freq * 4) % div) * 0x20000) / div;
channelSel = (channelSel << 17) | chan_frac;
- } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
- /*
- * freq_ref = 40 / (refdiva >> amoderefsel);
- * where refdiva=1 and amoderefsel=0
- * ndiv = ((chan_mhz * 4) / 3) / freq_ref;
- * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000
- */
- channelSel = (freq * 4) / 120;
- chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
- channelSel = (channelSel << 17) | chan_frac;
} else if (AR_SREV_9340(ah)) {
if (ah->is_clk_25mhz) {
channelSel = (freq * 2) / 75;
@@ -184,16 +176,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
} else {
channelSel = CHANSEL_2G(freq) >> 1;
}
- } else if (AR_SREV_9550(ah) || AR_SREV_9531(ah) ||
- AR_SREV_9561(ah)) {
- if (ah->is_clk_25mhz)
- div = 75;
- else
- div = 120;
-
- channelSel = (freq * 4) / div;
- chan_frac = (((freq * 4) % div) * 0x20000) / div;
- channelSel = (channelSel << 17) | chan_frac;
} else {
channelSel = CHANSEL_2G(freq);
}
--
1.7.0.4
Tomislav Požega <[email protected]> writes:
> Signed-off-by: Tomislav Po.ega <[email protected]>
No empty commit logs, please.
> ---
> drivers/net/wireless/ath/regd.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
> index 75ddaef..8d5a16b 100644
> --- a/drivers/net/wireless/ath/regd.h
> +++ b/drivers/net/wireless/ath/regd.h
> @@ -28,7 +28,6 @@ enum ctl_group {
> CTL_ETSI = 0x30,
> };
>
> -#define NO_CTL 0xff
The title is misleading, you are removing a duplicate define. Nothing to
do with includes.
--
Kalle Valo
Tomislav Požega <[email protected]> writes:
> AR9330, AR9485, AR9531, AR9550, AR9561 and AR9565 all use same
> channel set register configuration which allows for small code
> size reduction.
>
> Signed-off-by: Tomislav Po\270ega <[email protected]>
At least Gnus complains about character \270 in the Signed-off-by line.
Is your charset in order? The From line looks to be ok, though.
--
Kalle Valo
locales problems during some system upgrades. can you fix it without
resending?thanks
Tom Psyborg <[email protected]> writes:
> locales problems during some system upgrades. can you fix it without
> resending?
There's actually a bigger problem, I cannot find your patches from
patchwork:
https://patchwork.kernel.org/project/linux-wireless/list/
Maybe patchwork dropped them because of the charset problem? Anyway, you
have to resend so that I see the patches in patchwork.
--
Kalle Valo
Tom Psyborg <[email protected]> writes:
> Done.
Thanks. I see v2 now:
https://patchwork.kernel.org/project/linux-wireless/list/?series=91659
--
Kalle Valo