ath5k: fix NULL pointer in antenna configuration

[safe/jmp/linux-2.6] / drivers / net / wireless / ath / regd.h

diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 4d3c536..a1c3952 100644 (file)
--- 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
@@ -59,10 +65,13 @@ enum CountryCode {
        CTRY_ALGERIA = 12,
        CTRY_ARGENTINA = 32,
        CTRY_ARMENIA = 51,
+       CTRY_ARUBA = 533,
        CTRY_AUSTRALIA = 36,
        CTRY_AUSTRIA = 40,
        CTRY_AZERBAIJAN = 31,
        CTRY_BAHRAIN = 48,
+       CTRY_BANGLADESH = 50,
+       CTRY_BARBADOS = 52,
        CTRY_BELARUS = 112,
        CTRY_BELGIUM = 56,
        CTRY_BELIZE = 84,
@@ -71,6 +80,7 @@ enum CountryCode {
        CTRY_BRAZIL = 76,
        CTRY_BRUNEI_DARUSSALAM = 96,
        CTRY_BULGARIA = 100,
+       CTRY_CAMBODIA = 116,
        CTRY_CANADA = 124,
        CTRY_CHILE = 152,
        CTRY_CHINA = 156,
@@ -91,7 +101,11 @@ enum CountryCode {
        CTRY_GEORGIA = 268,
        CTRY_GERMANY = 276,
        CTRY_GREECE = 300,
+       CTRY_GREENLAND = 304,
+       CTRY_GRENEDA = 308,
+       CTRY_GUAM = 316,
        CTRY_GUATEMALA = 320,
+       CTRY_HAITI = 332,
        CTRY_HONDURAS = 340,
        CTRY_HONG_KONG = 344,
        CTRY_HUNGARY = 348,