Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/benet/be_cmds.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/net/cxgb4vf/t4vf_hw.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/pch_gbe/pch_gbe_main.c
Simple merge

diff --cc drivers/net/ppp_generic.c
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/sfc/efx.c
Simple merge

diff --cc drivers/net/sfc/net_driver.h
Simple merge

diff --cc drivers/net/sfc/nic.c
Simple merge

diff --cc drivers/net/stmmac/stmmac_main.c
index bfc2d12,2114837..c0dc785
--- 1/drivers/net/stmmac/stmmac_main.c
--- 2/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@@ -1526,10 -1520,8 +1528,8 @@@ static int stmmac_probe(struct net_devi
  
        DBG(probe, DEBUG, "%s: Scatter/Gather: %s - HW checksums: %s\n",
            dev->name, (dev->features & NETIF_F_SG) ? "on" : "off",
 -          (dev->features & NETIF_F_HW_CSUM) ? "on" : "off");
 +          (dev->features & NETIF_F_IP_CSUM) ? "on" : "off");
  
-       spin_lock_init(&priv->lock);
- 
        return ret;
  }
  

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 3161a59,a7b82f0..f2eec38
--- 1/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--- 2/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@@ -57,2327 -55,17 +57,2330 @@@
  #define SUB_NUM_CTL_MODES_AT_5G_40 2    /* excluding HT40, EXT-OFDM */
  #define SUB_NUM_CTL_MODES_AT_2G_40 3    /* excluding HT40, EXT-OFDM, EXT-CCK */
  
 -static const struct ar9300_eeprom ar9300_default = {
 +static int ar9003_hw_power_interpolate(int32_t x,
 +                                     int32_t *px, int32_t *py, u_int16_t np);
++
+ #define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6))
+ 
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
 +static const struct ar9300_eeprom ar9300_default = {
 +      .eepromVersion = 2,
 +      .templateVersion = 2,
 +      .macAddr = {1, 2, 3, 4, 5, 6},
 +      .custData = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +                   0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 +      .baseEepHeader = {
 +              .regDmn = { LE16(0), LE16(0x1f) },
 +              .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
 +              .opCapFlags = {
 +                      .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
 +                      .eepMisc = 0,
 +              },
 +              .rfSilent = 0,
 +              .blueToothOptions = 0,
 +              .deviceCap = 0,
 +              .deviceType = 5, /* takes lower byte in eeprom location */
 +              .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
 +              .params_for_tuning_caps = {0, 0},
 +              .featureEnable = 0x0c,
 +               /*
 +                * bit0 - enable tx temp comp - disabled
 +                * bit1 - enable tx volt comp - disabled
 +                * bit2 - enable fastClock - enabled
 +                * bit3 - enable doubling - enabled
 +                * bit4 - enable internal regulator - disabled
 +                * bit5 - enable pa predistortion - disabled
 +                */
 +              .miscConfiguration = 0, /* bit0 - turn down drivestrength */
 +              .eepromWriteEnableGpio = 3,
 +              .wlanDisableGpio = 0,
 +              .wlanLedGpio = 8,
 +              .rxBandSelectGpio = 0xff,
 +              .txrxgain = 0,
 +              .swreg = 0,
 +       },
 +      .modalHeader2G = {
 +      /* ar9300_modal_eep_header  2g */
 +              /* 4 idle,t1,t2,b(4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
 +              .antCtrlCommon2 = LE32(0x22222),
 +
 +              /*
 +               * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
 +               * rx1, rx12, b (2 bits each)
 +               */
 +              .antCtrlChain = { LE16(0x150), LE16(0x150), LE16(0x150) },
 +
 +              /*
 +               * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
 +               * for ar9280 (0xa20c/b20c 5:0)
 +               */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for ar9280 (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 36,
 +              .voltSlope = 0,
 +
 +              /*
 +               * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
 +               * channels in usual fbin coding format
 +               */
 +              .spurChans = {0, 0, 0, 0, 0},
 +
 +              /*
 +               * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
 +               * if the register is per chain
 +               */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {1, 1, 1},/* 3 chain */
 +              .db_stage2 = {1, 1, 1}, /* 3 chain  */
 +              .db_stage3 = {0, 0, 0},
 +              .db_stage4 = {0, 0, 0},
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2c,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0cf0e0e0),
 +              .papdRateMaskHt40 = LE32(0x6cf0e0e0),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +       },
 +      .base_ext1 = {
 +              .ant_div_control = 0,
 +              .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 +      },
 +      .calFreqPier2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1),
 +       },
 +      /* ar9300_cal_data_per_freq_op_loop 2g */
 +      .calPierData2G = {
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +       },
 +      .calTarget_freqbin_Cck = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2484, 1),
 +       },
 +      .calTarget_freqbin_2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTarget_freqbin_2GHT20 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTarget_freqbin_2GHT40 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTargetPowerCck = {
 +               /* 1L-5L,5S,11L,11S */
 +               { {36, 36, 36, 36} },
 +               { {36, 36, 36, 36} },
 +      },
 +      .calTargetPower2G = {
 +               /* 6-24,36,48,54 */
 +               { {32, 32, 28, 24} },
 +               { {32, 32, 28, 24} },
 +               { {32, 32, 28, 24} },
 +      },
 +      .calTargetPower2GHT20 = {
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +      },
 +      .calTargetPower2GHT40 = {
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +              { {32, 32, 32, 32, 28, 20, 32, 32, 28, 20, 32, 32, 28, 20} },
 +      },
 +      .ctlIndex_2G =  {
 +              0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
 +              0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
 +      },
 +      .ctl_freqbin_2G = {
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2457, 1),
 +                      FREQ2FBIN(2462, 1)
 +              },
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +              {
 +                      FREQ2FBIN(2422, 1),
 +                      FREQ2FBIN(2427, 1),
 +                      FREQ2FBIN(2447, 1),
 +                      FREQ2FBIN(2452, 1)
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +              },
 +
 +              {
 +                      /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              }
 +       },
 +      .ctlPowerData_2G = {
-                { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
 +
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++               { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
 +       },
 +      .modalHeader5G = {
 +              /* 4 idle,t1,t2,b (4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
 +              .antCtrlCommon2 = LE32(0x22222),
 +               /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
 +              .antCtrlChain = {
 +                      LE16(0x000), LE16(0x000), LE16(0x000),
 +              },
 +               /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for merlin (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 68,
 +              .voltSlope = 0,
 +              /* spurChans spur channels in usual fbin coding format */
 +              .spurChans = {0, 0, 0, 0, 0},
 +              /* noiseFloorThreshCh Check if the register is per chain */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {3, 3, 3}, /* 3 chain */
 +              .db_stage2 = {3, 3, 3}, /* 3 chain */
 +              .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
 +              .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2d,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0c80c080),
 +              .papdRateMaskHt40 = LE32(0x0080c080),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +       },
 +      .base_ext2 = {
 +              .tempSlopeLow = 0,
 +              .tempSlopeHigh = 0,
 +              .xatten1DBLow = {0, 0, 0},
 +              .xatten1MarginLow = {0, 0, 0},
 +              .xatten1DBHigh = {0, 0, 0},
 +              .xatten1MarginHigh = {0, 0, 0}
 +      },
 +      .calFreqPier5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calPierData5G = {
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +
 +      },
 +      .calTarget_freqbin_5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT20 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT40 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +       },
 +      .calTargetPower5G = {
 +              /* 6-24,36,48,54 */
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +              { {20, 20, 20, 10} },
 +       },
 +      .calTargetPower5GHT20 = {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +       },
 +      .calTargetPower5GHT40 =  {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +              { {20, 20, 10, 10, 0, 0, 10, 10, 0, 0, 10, 10, 0, 0} },
 +       },
 +      .ctlIndex_5G =  {
 +              0x10, 0x16, 0x18, 0x40, 0x46,
 +              0x48, 0x30, 0x36, 0x38
 +      },
 +      .ctl_freqbin_5G =  {
 +              {
 +                      /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +              {
 +                      /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
 +                      /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
 +              },
 +
 +              {
 +                      /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[3].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[3].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[4].ctlEdges[4].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[5].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
 +                      /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[5].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[5].ctlEdges[7].bChannel */ 0xFF
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
 +                      /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
 +                      /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
 +                      /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
 +              }
 +       },
 +      .ctlPowerData_5G = {
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 0}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 0}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
++                              CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
 +                      }
 +              },
 +       }
 +};
 +
 +static const struct ar9300_eeprom ar9300_x113 = {
 +      .eepromVersion = 2,
 +      .templateVersion = 6,
 +      .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
 +      .custData = {"x113-023-f0000"},
 +      .baseEepHeader = {
 +              .regDmn = { LE16(0), LE16(0x1f) },
 +              .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
 +              .opCapFlags = {
 +                      .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
 +                      .eepMisc = 0,
 +              },
 +              .rfSilent = 0,
 +              .blueToothOptions = 0,
 +              .deviceCap = 0,
 +              .deviceType = 5, /* takes lower byte in eeprom location */
 +              .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
 +              .params_for_tuning_caps = {0, 0},
 +              .featureEnable = 0x0d,
 +               /*
 +                * bit0 - enable tx temp comp - disabled
 +                * bit1 - enable tx volt comp - disabled
 +                * bit2 - enable fastClock - enabled
 +                * bit3 - enable doubling - enabled
 +                * bit4 - enable internal regulator - disabled
 +                * bit5 - enable pa predistortion - disabled
 +                */
 +              .miscConfiguration = 0, /* bit0 - turn down drivestrength */
 +              .eepromWriteEnableGpio = 6,
 +              .wlanDisableGpio = 0,
 +              .wlanLedGpio = 8,
 +              .rxBandSelectGpio = 0xff,
 +              .txrxgain = 0x21,
 +              .swreg = 0,
 +       },
 +      .modalHeader2G = {
 +      /* ar9300_modal_eep_header  2g */
 +              /* 4 idle,t1,t2,b(4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
 +              .antCtrlCommon2 = LE32(0x44444),
 +
 +              /*
 +               * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
 +               * rx1, rx12, b (2 bits each)
 +               */
 +              .antCtrlChain = { LE16(0x150), LE16(0x150), LE16(0x150) },
 +
 +              /*
 +               * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
 +               * for ar9280 (0xa20c/b20c 5:0)
 +               */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for ar9280 (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 25,
 +              .voltSlope = 0,
 +
 +              /*
 +               * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
 +               * channels in usual fbin coding format
 +               */
 +              .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
 +
 +              /*
 +               * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
 +               * if the register is per chain
 +               */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {1, 1, 1},/* 3 chain */
 +              .db_stage2 = {1, 1, 1}, /* 3 chain  */
 +              .db_stage3 = {0, 0, 0},
 +              .db_stage4 = {0, 0, 0},
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2c,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0c80c080),
 +              .papdRateMaskHt40 = LE32(0x0080c080),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +       },
 +       .base_ext1 = {
 +              .ant_div_control = 0,
 +              .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 +       },
 +      .calFreqPier2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1),
 +       },
 +      /* ar9300_cal_data_per_freq_op_loop 2g */
 +      .calPierData2G = {
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +       },
 +      .calTarget_freqbin_Cck = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2472, 1),
 +       },
 +      .calTarget_freqbin_2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTarget_freqbin_2GHT20 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTarget_freqbin_2GHT40 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +       },
 +      .calTargetPowerCck = {
 +               /* 1L-5L,5S,11L,11S */
 +               { {34, 34, 34, 34} },
 +               { {34, 34, 34, 34} },
 +      },
 +      .calTargetPower2G = {
 +               /* 6-24,36,48,54 */
 +               { {34, 34, 32, 32} },
 +               { {34, 34, 32, 32} },
 +               { {34, 34, 32, 32} },
 +      },
 +      .calTargetPower2GHT20 = {
 +              { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
 +              { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
 +              { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
 +      },
 +      .calTargetPower2GHT40 = {
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
 +      },
 +      .ctlIndex_2G =  {
 +              0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
 +              0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
 +      },
 +      .ctl_freqbin_2G = {
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2457, 1),
 +                      FREQ2FBIN(2462, 1)
 +              },
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +              {
 +                      FREQ2FBIN(2422, 1),
 +                      FREQ2FBIN(2427, 1),
 +                      FREQ2FBIN(2447, 1),
 +                      FREQ2FBIN(2452, 1)
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +              },
 +
 +              {
 +                      /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              }
 +       },
 +      .ctlPowerData_2G = {
-                { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
 +
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++               { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
-                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
++               { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
 +       },
 +      .modalHeader5G = {
 +              /* 4 idle,t1,t2,b (4 bits per setting) */
 +              .antCtrlCommon = LE32(0x220),
 +              /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
 +              .antCtrlCommon2 = LE32(0x11111),
 +               /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
 +              .antCtrlChain = {
 +                      LE16(0x150), LE16(0x150), LE16(0x150),
 +              },
 +               /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for merlin (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 68,
 +              .voltSlope = 0,
 +              /* spurChans spur channels in usual fbin coding format */
 +              .spurChans = {FREQ2FBIN(5500, 0), 0, 0, 0, 0},
 +              /* noiseFloorThreshCh Check if the register is per chain */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {3, 3, 3}, /* 3 chain */
 +              .db_stage2 = {3, 3, 3}, /* 3 chain */
 +              .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
 +              .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2d,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0cf0e0e0),
 +              .papdRateMaskHt40 = LE32(0x6cf0e0e0),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +       },
 +      .base_ext2 = {
 +              .tempSlopeLow = 72,
 +              .tempSlopeHigh = 105,
 +              .xatten1DBLow = {0, 0, 0},
 +              .xatten1MarginLow = {0, 0, 0},
 +              .xatten1DBHigh = {0, 0, 0},
 +              .xatten1MarginHigh = {0, 0, 0}
 +       },
 +      .calFreqPier5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5785, 0)
 +      },
 +      .calPierData5G = {
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +                      {
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                              {0, 0, 0, 0, 0},
 +                      },
 +
 +      },
 +      .calTarget_freqbin_5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5785, 0)
 +      },
 +      .calTarget_freqbin_5GHT20 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT40 = {
 +              FREQ2FBIN(5190, 0),
 +              FREQ2FBIN(5230, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5410, 0),
 +              FREQ2FBIN(5510, 0),
 +              FREQ2FBIN(5670, 0),
 +              FREQ2FBIN(5755, 0),
 +              FREQ2FBIN(5825, 0)
 +       },
 +      .calTargetPower5G = {
 +              /* 6-24,36,48,54 */
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +              { {42, 40, 40, 34} },
 +       },
 +      .calTargetPower5GHT20 = {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
 +              { {38, 38, 38, 38, 32, 28, 38, 38, 32, 28, 38, 38, 32, 26} },
 +              { {36, 36, 36, 36, 32, 28, 36, 36, 32, 28, 36, 36, 32, 26} },
 +       },
 +      .calTargetPower5GHT40 =  {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
 +              { {36, 36, 36, 36, 30, 26, 36, 36, 30, 26, 36, 36, 30, 24} },
 +              { {34, 34, 34, 34, 30, 26, 34, 34, 30, 26, 34, 34, 30, 24} },
 +       },
 +      .ctlIndex_5G =  {
 +              0x10, 0x16, 0x18, 0x40, 0x46,
 +              0x48, 0x30, 0x36, 0x38
 +      },
 +      .ctl_freqbin_5G =  {
 +              {
 +                      /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +              {
 +                      /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
 +                      /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
 +              },
 +
 +              {
 +                      /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[3].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[3].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[4].ctlEdges[4].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[5].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
 +                      /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[5].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[5].ctlEdges[7].bChannel */ 0xFF
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
 +                      /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
 +                      /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
 +                      /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
 +              }
 +       },
 +      .ctlPowerData_5G = {
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 0}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 0}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
++                              CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
 +                      }
 +              },
 +       }
 +};
 +
 +
 +static const struct ar9300_eeprom ar9300_h112 = {
 +      .eepromVersion = 2,
 +      .templateVersion = 3,
 +      .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
 +      .custData = {"h112-241-f0000"},
 +      .baseEepHeader = {
 +              .regDmn = { LE16(0), LE16(0x1f) },
 +              .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
 +              .opCapFlags = {
 +                      .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
 +                      .eepMisc = 0,
 +              },
 +              .rfSilent = 0,
 +              .blueToothOptions = 0,
 +              .deviceCap = 0,
 +              .deviceType = 5, /* takes lower byte in eeprom location */
 +              .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
 +              .params_for_tuning_caps = {0, 0},
 +              .featureEnable = 0x0d,
 +              /*
 +               * bit0 - enable tx temp comp - disabled
 +               * bit1 - enable tx volt comp - disabled
 +               * bit2 - enable fastClock - enabled
 +               * bit3 - enable doubling - enabled
 +               * bit4 - enable internal regulator - disabled
 +               * bit5 - enable pa predistortion - disabled
 +               */
 +              .miscConfiguration = 0, /* bit0 - turn down drivestrength */
 +              .eepromWriteEnableGpio = 6,
 +              .wlanDisableGpio = 0,
 +              .wlanLedGpio = 8,
 +              .rxBandSelectGpio = 0xff,
 +              .txrxgain = 0x10,
 +              .swreg = 0,
 +      },
 +      .modalHeader2G = {
 +              /* ar9300_modal_eep_header  2g */
 +              /* 4 idle,t1,t2,b(4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
 +              .antCtrlCommon2 = LE32(0x44444),
 +
 +              /*
 +               * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
 +               * rx1, rx12, b (2 bits each)
 +               */
 +              .antCtrlChain = { LE16(0x150), LE16(0x150), LE16(0x150) },
 +
 +              /*
 +               * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
 +               * for ar9280 (0xa20c/b20c 5:0)
 +               */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for ar9280 (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 25,
 +              .voltSlope = 0,
 +
 +              /*
 +               * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
 +               * channels in usual fbin coding format
 +               */
 +              .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
 +
 +              /*
 +               * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
 +               * if the register is per chain
 +               */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {1, 1, 1},/* 3 chain */
 +              .db_stage2 = {1, 1, 1}, /* 3 chain  */
 +              .db_stage3 = {0, 0, 0},
 +              .db_stage4 = {0, 0, 0},
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2c,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x80c080),
 +              .papdRateMaskHt40 = LE32(0x80c080),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +      },
 +      .base_ext1 = {
 +              .ant_div_control = 0,
 +              .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 +      },
 +      .calFreqPier2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1),
 +      },
 +      /* ar9300_cal_data_per_freq_op_loop 2g */
 +      .calPierData2G = {
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +      },
 +      .calTarget_freqbin_Cck = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2484, 1),
 +      },
 +      .calTarget_freqbin_2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTarget_freqbin_2GHT20 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTarget_freqbin_2GHT40 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTargetPowerCck = {
 +              /* 1L-5L,5S,11L,11S */
 +              { {34, 34, 34, 34} },
 +              { {34, 34, 34, 34} },
 +      },
 +      .calTargetPower2G = {
 +              /* 6-24,36,48,54 */
 +              { {34, 34, 32, 32} },
 +              { {34, 34, 32, 32} },
 +              { {34, 34, 32, 32} },
 +      },
 +      .calTargetPower2GHT20 = {
 +              { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
 +              { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
 +              { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
 +      },
 +      .calTargetPower2GHT40 = {
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
 +              { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
 +      },
 +      .ctlIndex_2G =  {
 +              0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
 +              0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
 +      },
 +      .ctl_freqbin_2G = {
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2457, 1),
 +                      FREQ2FBIN(2462, 1)
 +              },
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +              {
 +                      FREQ2FBIN(2422, 1),
 +                      FREQ2FBIN(2427, 1),
 +                      FREQ2FBIN(2447, 1),
 +                      FREQ2FBIN(2452, 1)
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +              },
 +
 +              {
 +                      /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
 +              }
 +      },
 +      .ctlPowerData_2G = {
-               { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
 +
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++              { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
 +      },
 +      .modalHeader5G = {
 +              /* 4 idle,t1,t2,b (4 bits per setting) */
 +              .antCtrlCommon = LE32(0x220),
 +              /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
 +              .antCtrlCommon2 = LE32(0x44444),
 +              /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
 +              .antCtrlChain = {
 +                      LE16(0x150), LE16(0x150), LE16(0x150),
 +              },
 +              /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
 +              .xatten1DB = {0, 0, 0},
 +
 +              /*
 +               * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
 +               * for merlin (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0, 0, 0},
 +              .tempSlope = 45,
 +              .voltSlope = 0,
 +              /* spurChans spur channels in usual fbin coding format */
 +              .spurChans = {0, 0, 0, 0, 0},
 +              /* noiseFloorThreshCh Check if the register is per chain */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {3, 3, 3}, /* 3 chain */
 +              .db_stage2 = {3, 3, 3}, /* 3 chain */
 +              .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
 +              .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2d,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0cf0e0e0),
 +              .papdRateMaskHt40 = LE32(0x6cf0e0e0),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +      },
 +      .base_ext2 = {
 +              .tempSlopeLow = 40,
 +              .tempSlopeHigh = 50,
 +              .xatten1DBLow = {0, 0, 0},
 +              .xatten1MarginLow = {0, 0, 0},
 +              .xatten1DBHigh = {0, 0, 0},
 +              .xatten1MarginHigh = {0, 0, 0}
 +      },
 +      .calFreqPier5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calPierData5G = {
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +
 +      },
 +      .calTarget_freqbin_5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT20 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT40 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5240, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5745, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTargetPower5G = {
 +              /* 6-24,36,48,54 */
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +              { {30, 30, 28, 24} },
 +      },
 +      .calTargetPower5GHT20 = {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 20, 20, 20, 16} },
 +              { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 20, 20, 20, 16} },
 +              { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 18, 18, 18, 16} },
 +              { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 18, 18, 18, 16} },
 +              { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 16, 16, 16, 14} },
 +              { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 16, 16, 16, 14} },
 +              { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 14, 14, 14, 12} },
 +              { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 14, 14, 14, 12} },
 +      },
 +      .calTargetPower5GHT40 =  {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 18, 18, 18, 14} },
 +              { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 18, 18, 18, 14} },
 +              { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 16, 16, 16, 12} },
 +              { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 16, 16, 16, 12} },
 +              { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 14, 14, 14, 10} },
 +              { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 14, 14, 14, 10} },
 +              { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 12, 12, 12, 8} },
 +              { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 12, 12, 12, 8} },
 +      },
 +      .ctlIndex_5G =  {
 +              0x10, 0x16, 0x18, 0x40, 0x46,
 +              0x48, 0x30, 0x36, 0x38
 +      },
 +      .ctl_freqbin_5G =  {
 +              {
 +                      /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +              {
 +                      /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
 +                      /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
 +              },
 +
 +              {
 +                      /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[3].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[3].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[4].ctlEdges[4].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[5].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[4].ctlEdges[7].bChannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
 +                      /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[5].ctlEdges[6].bChannel */ 0xFF,
 +                      /* Data[5].ctlEdges[7].bChannel */ 0xFF
 +              },
 +
 +              {
 +                      /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
 +                      /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
 +              },
 +
 +              {
 +                      /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
 +                      /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
 +                      /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
 +              }
 +      },
 +      .ctlPowerData_5G = {
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 0}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 0}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
++                              CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
 +                      }
 +              },
 +      }
 +};
 +
 +
 +static const struct ar9300_eeprom ar9300_x112 = {
 +      .eepromVersion = 2,
 +      .templateVersion = 5,
 +      .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
 +      .custData = {"x112-041-f0000"},
 +      .baseEepHeader = {
 +              .regDmn = { LE16(0), LE16(0x1f) },
 +              .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
 +              .opCapFlags = {
 +                      .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
 +                      .eepMisc = 0,
 +              },
 +              .rfSilent = 0,
 +              .blueToothOptions = 0,
 +              .deviceCap = 0,
 +              .deviceType = 5, /* takes lower byte in eeprom location */
 +              .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
 +              .params_for_tuning_caps = {0, 0},
 +              .featureEnable = 0x0d,
 +              /*
 +               * bit0 - enable tx temp comp - disabled
 +               * bit1 - enable tx volt comp - disabled
 +               * bit2 - enable fastclock - enabled
 +               * bit3 - enable doubling - enabled
 +               * bit4 - enable internal regulator - disabled
 +               * bit5 - enable pa predistortion - disabled
 +               */
 +              .miscConfiguration = 0, /* bit0 - turn down drivestrength */
 +              .eepromWriteEnableGpio = 6,
 +              .wlanDisableGpio = 0,
 +              .wlanLedGpio = 8,
 +              .rxBandSelectGpio = 0xff,
 +              .txrxgain = 0x0,
 +              .swreg = 0,
 +      },
 +      .modalHeader2G = {
 +              /* ar9300_modal_eep_header  2g */
 +              /* 4 idle,t1,t2,b(4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
 +              .antCtrlCommon2 = LE32(0x22222),
 +
 +              /*
 +               * antCtrlChain[ar9300_max_chains]; 6 idle, t, r,
 +               * rx1, rx12, b (2 bits each)
 +               */
 +              .antCtrlChain = { LE16(0x10), LE16(0x10), LE16(0x10) },
 +
 +              /*
 +               * xatten1DB[AR9300_max_chains];  3 xatten1_db
 +               * for ar9280 (0xa20c/b20c 5:0)
 +               */
 +              .xatten1DB = {0x1b, 0x1b, 0x1b},
 +
 +              /*
 +               * xatten1Margin[ar9300_max_chains]; 3 xatten1_margin
 +               * for ar9280 (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0x15, 0x15, 0x15},
 +              .tempSlope = 50,
 +              .voltSlope = 0,
 +
 +              /*
 +               * spurChans[OSPrey_eeprom_modal_sPURS]; spur
 +               * channels in usual fbin coding format
 +               */
 +              .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
 +
 +              /*
 +               * noiseFloorThreshch[ar9300_max_cHAINS]; 3 Check
 +               * if the register is per chain
 +               */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {1, 1, 1},/* 3 chain */
 +              .db_stage2 = {1, 1, 1}, /* 3 chain  */
 +              .db_stage3 = {0, 0, 0},
 +              .db_stage4 = {0, 0, 0},
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2c,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0c80c080),
 +              .papdRateMaskHt40 = LE32(0x0080c080),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +      },
 +      .base_ext1 = {
 +              .ant_div_control = 0,
 +              .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 +      },
 +      .calFreqPier2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1),
 +      },
 +      /* ar9300_cal_data_per_freq_op_loop 2g */
 +      .calPierData2G = {
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +              { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
 +      },
 +      .calTarget_freqbin_Cck = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2472, 1),
 +      },
 +      .calTarget_freqbin_2G = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTarget_freqbin_2GHT20 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTarget_freqbin_2GHT40 = {
 +              FREQ2FBIN(2412, 1),
 +              FREQ2FBIN(2437, 1),
 +              FREQ2FBIN(2472, 1)
 +      },
 +      .calTargetPowerCck = {
 +              /* 1L-5L,5S,11L,11s */
 +              { {38, 38, 38, 38} },
 +              { {38, 38, 38, 38} },
 +      },
 +      .calTargetPower2G = {
 +              /* 6-24,36,48,54 */
 +              { {38, 38, 36, 34} },
 +              { {38, 38, 36, 34} },
 +              { {38, 38, 34, 32} },
 +      },
 +      .calTargetPower2GHT20 = {
 +              { {36, 36, 36, 36, 36, 34, 34, 32, 30, 28, 28, 28, 28, 26} },
 +              { {36, 36, 36, 36, 36, 34, 36, 34, 32, 30, 30, 30, 28, 26} },
 +              { {36, 36, 36, 36, 36, 34, 34, 32, 30, 28, 28, 28, 28, 26} },
 +      },
 +      .calTargetPower2GHT40 = {
 +              { {36, 36, 36, 36, 34, 32, 32, 30, 28, 26, 26, 26, 26, 24} },
 +              { {36, 36, 36, 36, 34, 32, 34, 32, 30, 28, 28, 28, 28, 24} },
 +              { {36, 36, 36, 36, 34, 32, 32, 30, 28, 26, 26, 26, 26, 24} },
 +      },
 +      .ctlIndex_2G =  {
 +              0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
 +              0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
 +      },
 +      .ctl_freqbin_2G = {
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2457, 1),
 +                      FREQ2FBIN(2462, 1)
 +              },
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +
 +              {
 +                      FREQ2FBIN(2412, 1),
 +                      FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2462, 1),
 +                      0xFF,
 +              },
 +              {
 +                      FREQ2FBIN(2422, 1),
 +                      FREQ2FBIN(2427, 1),
 +                      FREQ2FBIN(2447, 1),
 +                      FREQ2FBIN(2452, 1)
 +              },
 +
 +              {
 +                      /* Data[4].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[4].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[4].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
 +                      /* Data[4].ctledges[3].bchannel */ FREQ2FBIN(2484, 1),
 +              },
 +
 +              {
 +                      /* Data[5].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[5].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[5].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[6].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[6].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      FREQ2FBIN(2472, 1),
 +                      0,
 +              },
 +
 +              {
 +                      /* Data[7].ctledges[0].bchannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[7].ctledges[1].bchannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[7].ctledges[2].bchannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[7].ctledges[3].bchannel */ FREQ2FBIN(2462, 1),
 +              },
 +
 +              {
 +                      /* Data[8].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[8].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[8].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
 +              },
 +
 +              {
 +                      /* Data[9].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[9].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[9].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[10].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
 +                      /* Data[10].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
 +                      /* Data[10].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
 +                      0
 +              },
 +
 +              {
 +                      /* Data[11].ctledges[0].bchannel */ FREQ2FBIN(2422, 1),
 +                      /* Data[11].ctledges[1].bchannel */ FREQ2FBIN(2427, 1),
 +                      /* Data[11].ctledges[2].bchannel */ FREQ2FBIN(2447, 1),
 +                      /* Data[11].ctledges[3].bchannel */ FREQ2FBIN(2462, 1),
 +              }
 +      },
 +      .ctlPowerData_2G = {
-               { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
 +
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
++              { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-               { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
-               { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
 +
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
++              { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
 +      },
 +      .modalHeader5G = {
 +              /* 4 idle,t1,t2,b (4 bits per setting) */
 +              .antCtrlCommon = LE32(0x110),
 +              /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
 +              .antCtrlCommon2 = LE32(0x22222),
 +              /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
 +              .antCtrlChain = {
 +                      LE16(0x0), LE16(0x0), LE16(0x0),
 +              },
 +              /* xatten1DB 3 xatten1_db for ar9280 (0xa20c/b20c 5:0) */
 +              .xatten1DB = {0x13, 0x19, 0x17},
 +
 +              /*
 +               * xatten1Margin[ar9300_max_chains]; 3 xatten1_margin
 +               * for merlin (0xa20c/b20c 16:12
 +               */
 +              .xatten1Margin = {0x19, 0x19, 0x19},
 +              .tempSlope = 70,
 +              .voltSlope = 15,
 +              /* spurChans spur channels in usual fbin coding format */
 +              .spurChans = {0, 0, 0, 0, 0},
 +              /* noiseFloorThreshch check if the register is per chain */
 +              .noiseFloorThreshCh = {-1, 0, 0},
 +              .ob = {3, 3, 3}, /* 3 chain */
 +              .db_stage2 = {3, 3, 3}, /* 3 chain */
 +              .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
 +              .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
 +              .xpaBiasLvl = 0,
 +              .txFrameToDataStart = 0x0e,
 +              .txFrameToPaOn = 0x0e,
 +              .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
 +              .antennaGain = 0,
 +              .switchSettling = 0x2d,
 +              .adcDesiredSize = -30,
 +              .txEndToXpaOff = 0,
 +              .txEndToRxOn = 0x2,
 +              .txFrameToXpaOn = 0xe,
 +              .thresh62 = 28,
 +              .papdRateMaskHt20 = LE32(0x0cf0e0e0),
 +              .papdRateMaskHt40 = LE32(0x6cf0e0e0),
 +              .futureModal = {
 +                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 +              },
 +      },
 +      .base_ext2 = {
 +              .tempSlopeLow = 72,
 +              .tempSlopeHigh = 105,
 +              .xatten1DBLow = {0x10, 0x14, 0x10},
 +              .xatten1MarginLow = {0x19, 0x19 , 0x19},
 +              .xatten1DBHigh = {0x1d, 0x20, 0x24},
 +              .xatten1MarginHigh = {0x10, 0x10, 0x10}
 +      },
 +      .calFreqPier5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5700, 0),
 +              FREQ2FBIN(5785, 0)
 +      },
 +      .calPierData5G = {
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +              {
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +                      {0, 0, 0, 0, 0},
 +              },
 +
 +      },
 +      .calTarget_freqbin_5G = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT20 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTarget_freqbin_5GHT40 = {
 +              FREQ2FBIN(5180, 0),
 +              FREQ2FBIN(5220, 0),
 +              FREQ2FBIN(5320, 0),
 +              FREQ2FBIN(5400, 0),
 +              FREQ2FBIN(5500, 0),
 +              FREQ2FBIN(5600, 0),
 +              FREQ2FBIN(5725, 0),
 +              FREQ2FBIN(5825, 0)
 +      },
 +      .calTargetPower5G = {
 +              /* 6-24,36,48,54 */
 +              { {32, 32, 28, 26} },
 +              { {32, 32, 28, 26} },
 +              { {32, 32, 28, 26} },
 +              { {32, 32, 26, 24} },
 +              { {32, 32, 26, 24} },
 +              { {32, 32, 24, 22} },
 +              { {30, 30, 24, 22} },
 +              { {30, 30, 24, 22} },
 +      },
 +      .calTargetPower5GHT20 = {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 32, 28, 26, 32, 26, 24, 22, 22, 22, 20, 20} },
 +              { {32, 32, 32, 32, 28, 26, 32, 26, 24, 22, 20, 18, 16, 16} },
 +              { {32, 32, 32, 32, 28, 26, 32, 24, 20, 16, 18, 16, 14, 14} },
 +              { {30, 30, 30, 30, 28, 26, 30, 24, 20, 16, 18, 16, 14, 14} },
 +              { {30, 30, 30, 30, 28, 26, 30, 24, 20, 16, 18, 16, 14, 14} },
 +      },
 +      .calTargetPower5GHT40 =  {
 +              /*
 +               * 0_8_16,1-3_9-11_17-19,
 +               * 4,5,6,7,12,13,14,15,20,21,22,23
 +               */
 +              { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
 +              { {32, 32, 32, 30, 28, 26, 30, 26, 24, 22, 22, 22, 20, 20} },
 +              { {32, 32, 32, 30, 28, 26, 30, 26, 24, 22, 20, 18, 16, 16} },
 +              { {32, 32, 32, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
 +              { {30, 30, 30, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
 +              { {30, 30, 30, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
 +      },
 +      .ctlIndex_5G =  {
 +              0x10, 0x16, 0x18, 0x40, 0x46,
 +              0x48, 0x30, 0x36, 0x38
 +      },
 +      .ctl_freqbin_5G =  {
 +              {
 +                      /* Data[0].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[0].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[0].ctledges[2].bchannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[0].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[0].ctledges[4].bchannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[0].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[0].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[0].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
 +              },
 +              {
 +                      /* Data[1].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[1].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[1].ctledges[2].bchannel */ FREQ2FBIN(5280, 0),
 +                      /* Data[1].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[1].ctledges[4].bchannel */ FREQ2FBIN(5520, 0),
 +                      /* Data[1].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[1].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[1].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[2].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[2].ctledges[1].bchannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[2].ctledges[2].bchannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[2].ctledges[3].bchannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[2].ctledges[4].bchannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[2].ctledges[5].bchannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[2].ctledges[6].bchannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[2].ctledges[7].bchannel */ FREQ2FBIN(5755, 0)
 +              },
 +
 +              {
 +                      /* Data[3].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[3].ctledges[1].bchannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[3].ctledges[2].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[3].ctledges[3].bchannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[3].ctledges[4].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[3].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[3].ctledges[6].bchannel */ 0xFF,
 +                      /* Data[3].ctledges[7].bchannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[4].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[4].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[4].ctledges[2].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[4].ctledges[3].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[4].ctledges[4].bchannel */ 0xFF,
 +                      /* Data[4].ctledges[5].bchannel */ 0xFF,
 +                      /* Data[4].ctledges[6].bchannel */ 0xFF,
 +                      /* Data[4].ctledges[7].bchannel */ 0xFF,
 +              },
 +
 +              {
 +                      /* Data[5].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[5].ctledges[1].bchannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[5].ctledges[2].bchannel */ FREQ2FBIN(5310, 0),
 +                      /* Data[5].ctledges[3].bchannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[5].ctledges[4].bchannel */ FREQ2FBIN(5590, 0),
 +                      /* Data[5].ctledges[5].bchannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[5].ctledges[6].bchannel */ 0xFF,
 +                      /* Data[5].ctledges[7].bchannel */ 0xFF
 +              },
 +
 +              {
 +                      /* Data[6].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[6].ctledges[1].bchannel */ FREQ2FBIN(5200, 0),
 +                      /* Data[6].ctledges[2].bchannel */ FREQ2FBIN(5220, 0),
 +                      /* Data[6].ctledges[3].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[6].ctledges[4].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[6].ctledges[5].bchannel */ FREQ2FBIN(5600, 0),
 +                      /* Data[6].ctledges[6].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[6].ctledges[7].bchannel */ FREQ2FBIN(5745, 0)
 +              },
 +
 +              {
 +                      /* Data[7].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
 +                      /* Data[7].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
 +                      /* Data[7].ctledges[2].bchannel */ FREQ2FBIN(5320, 0),
 +                      /* Data[7].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
 +                      /* Data[7].ctledges[4].bchannel */ FREQ2FBIN(5560, 0),
 +                      /* Data[7].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
 +                      /* Data[7].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
 +                      /* Data[7].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
 +              },
 +
 +              {
 +                      /* Data[8].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
 +                      /* Data[8].ctledges[1].bchannel */ FREQ2FBIN(5230, 0),
 +                      /* Data[8].ctledges[2].bchannel */ FREQ2FBIN(5270, 0),
 +                      /* Data[8].ctledges[3].bchannel */ FREQ2FBIN(5510, 0),
 +                      /* Data[8].ctledges[4].bchannel */ FREQ2FBIN(5550, 0),
 +                      /* Data[8].ctledges[5].bchannel */ FREQ2FBIN(5670, 0),
 +                      /* Data[8].ctledges[6].bchannel */ FREQ2FBIN(5755, 0),
 +                      /* Data[8].ctledges[7].bchannel */ FREQ2FBIN(5795, 0)
 +              }
 +      },
 +      .ctlPowerData_5G = {
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 0}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
-                               {60, 0}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 0}, {60, 0}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
++                              CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 1}, {60, 0},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
 +                      }
 +              },
 +              {
 +                      {
-                               {60, 1}, {60, 0}, {60, 1}, {60, 1},
-                               {60, 1}, {60, 1}, {60, 0}, {60, 1},
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
 +                      }
 +              },
 +              {
 +                      {
++                              CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
++                              CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
 +                      }
 +              },
 +      }
 +};
 +
 +static const struct ar9300_eeprom ar9300_h116 = {
        .eepromVersion = 2,
 -      .templateVersion = 2,
 -      .macAddr = {1, 2, 3, 4, 5, 6},
 -      .custData = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 -                   0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 +      .templateVersion = 4,
 +      .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
 +      .custData = {"h116-041-f0000"},
        .baseEepHeader = {
                .regDmn = { LE16(0), LE16(0x1f) },
 -              .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
 +              .txrxMask =  0x33, /* 4 bits tx and 4 bits rx */
                .opCapFlags = {
                        .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
                        .eepMisc = 0,

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 57f64db,655b303..9c14633
--- 1/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
--- 2/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@@ -280,23 -266,9 +275,23 @@@ struct cal_ctl_data_2g 
  } __packed;
  
  struct cal_ctl_data_5g {
-       struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G];
+       u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G];
  } __packed;
  
 +struct ar9300_BaseExtension_1 {
 +      u8 ant_div_control;
 +      u8 future[13];
 +} __packed;
 +
 +struct ar9300_BaseExtension_2 {
 +      int8_t    tempSlopeLow;
 +      int8_t    tempSlopeHigh;
 +      u8   xatten1DBLow[AR9300_MAX_CHAINS];
 +      u8   xatten1MarginLow[AR9300_MAX_CHAINS];
 +      u8   xatten1DBHigh[AR9300_MAX_CHAINS];
 +      u8   xatten1MarginHigh[AR9300_MAX_CHAINS];
 +} __packed;
 +
  struct ar9300_eeprom {
        u8 eepromVersion;
        u8 templateVersion;

diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/eeprom.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/eeprom_def.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/reg.h
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/main.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/tx.c
Simple merge

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/ceph/Makefile
index 153bdec,5f19415..e87ef43
--- 1/net/ceph/Makefile
--- 2/net/ceph/Makefile
+++ b/net/ceph/Makefile
@@@ -1,12 -1,9 +1,9 @@@
  #
  # Makefile for CEPH filesystem.
  #
- 
- ifneq ($(KERNELRELEASE),)
- 
  obj-$(CONFIG_CEPH_LIB) += libceph.o
  
 -libceph-objs := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \
 +libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \
        mon_client.o \
        osd_client.o osdmap.o crush/crush.o crush/mapper.o crush/hash.o \
        debugfs.o \

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/request_sock.c
Simple merge

diff --cc net/dccp/input.c
Simple merge

diff --cc net/decnet/af_decnet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_minisocks.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/l2tp/l2tp_ip.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/x25/x25_link.c
Simple merge