[PATCH 1/2] ath,ar9170: move CTL_ defines into regd.h

[PATCH 1/2] ath,ar9170: move CTL_ defines into regd.h

[Joerg Albert]

The ar9170 driver needs the defines for conformance test limit groups
and cannot include regd_common.h

Signed-off-by: Joerg Albert <jal2@gmx.de>
---
 drivers/net/wireless/ath/regd.h        |    6 ++++++
 drivers/net/wireless/ath/regd_common.h |    6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 4d3c536..c1dd857 100644
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -22,6 +22,12 @@
 
 #include "ath.h"
 
+enum ctl_group {
+	CTL_FCC = 0x10,
+	CTL_MKK = 0x40,
+	CTL_ETSI = 0x30,
+};
+
 #define NO_CTL 0xff
 #define SD_NO_CTL               0xE0
 #define NO_CTL                  0xff
diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index ad6d938..9847af7 100644
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -154,12 +154,6 @@ enum EnumRd {
 	DEBUG_REG_DMN = 0x01ff,
 };
 
-enum ctl_group {
-	CTL_FCC = 0x10,
-	CTL_MKK = 0x40,
-	CTL_ETSI = 0x30,
-};
-
 /* Regpair to CTL band mapping */
 static struct reg_dmn_pair_mapping regDomainPairs[] = {
 	/* regpair, 5 GHz CTL, 2 GHz CTL */
-- 
1.6.0.4

Re: [PATCH 1/2] ath,ar9170: move CTL_ defines into regd.h

[Luis R. Rodriguez]

On Sat, Sep 5, 2009 at 7:07 AM, Joerg Albert<jal2@gmx.de> wrote:
> The ar9170 driver needs the defines for conformance test limit groups
> and cannot include regd_common.h
>
> Signed-off-by: Joerg Albert <jal2@gmx.de>

Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>

Just please test compilation of ath5k and ath9k as well.

  Luis

Re: [PATCH 1/2] ath,ar9170: move CTL_ defines into regd.h

[Joerg Albert]

On 09/05/2009 09:33 PM, Luis R. Rodriguez wrote:
> On Sat, Sep 5, 2009 at 7:07 AM, Joerg Albert<jal2@gmx.de> wrote:
>> The ar9170 driver needs the defines for conformance test limit groups
>> and cannot include regd_common.h
>>
>> Signed-off-by: Joerg Albert <jal2@gmx.de>
> 
> Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> 
> Just please test compilation of ath5k and ath9k as well.

They compile fine.

Sometime we should IMHO unify the CTL_* defines in the driver below ath/.
Currently ath5k, ath9k and regd.h have separate definitions for the modes, e.g.

~/src/wireless.gits/wireless-testing/drivers/net/wireless/ath$ fgrep -r --include=*.h CTL_11A *
ath5k/eeprom.h: AR5K_CTL_11A = 0,
ath9k/eeprom.h:#define CTL_11A                 0
ath9k/eeprom.h:#define CTL_11A_EXT (CTL_11A | EXT_ADDITIVE)
regd.h:#define CTL_11A                 0

Regards,
Joerg.

Re: [PATCH 1/2] ath,ar9170: move CTL_ defines into regd.h

[Luis R. Rodriguez]

On Sat, Sep 5, 2009 at 1:32 PM, Joerg Albert<jal2@gmx.de> wrote:
> On 09/05/2009 09:33 PM, Luis R. Rodriguez wrote:
>> On Sat, Sep 5, 2009 at 7:07 AM, Joerg Albert<jal2@gmx.de> wrote:
>>> The ar9170 driver needs the defines for conformance test limit groups
>>> and cannot include regd_common.h
>>>
>>> Signed-off-by: Joerg Albert <jal2@gmx.de>
>>
>> Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>
>>
>> Just please test compilation of ath5k and ath9k as well.
>
> They compile fine.
>
> Sometime we should IMHO unify the CTL_* defines in the driver below ath/.
> Currently ath5k, ath9k and regd.h have separate definitions for the modes, e.g.
>
> ~/src/wireless.gits/wireless-testing/drivers/net/wireless/ath$ fgrep -r --include=*.h CTL_11A *
> ath5k/eeprom.h: AR5K_CTL_11A = 0,
> ath9k/eeprom.h:#define CTL_11A                 0
> ath9k/eeprom.h:#define CTL_11A_EXT (CTL_11A | EXT_ADDITIVE)
> regd.h:#define CTL_11A                 0

right, that's the idea of ath.ko, to unify as much as we can, step by
step. If you see anything else to be shared just send a patch.

  Luis