[iwn] Fix required calibration flags for the Centrino 1000 NIC. master
authorMichael Neumann <mneumann@ntecs.de>
Sat, 23 Aug 2014 11:03:58 +0000 (13:03 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Sat, 23 Aug 2014 11:03:58 +0000 (13:03 +0200)
Tested with Intel Centrino Wireless-N 1000.

Obtained-From: FreeBSD (commit dd4e54a1ddf657f080a88c674e12459f404dea61)
Fixes: http://bugs.dragonflybsd.org/issues/2720

sys/dev/netif/iwn/if_iwn_chip_cfg.h

index 8cf071a..ca2cdf3 100644 (file)
@@ -206,14 +206,16 @@ static const struct iwn_base_params iwn1000_base_params = {
        .regulatory_bands = iwn5000_regulatory_bands,
        .enhanced_TX_power = false,
        .calib_need =
-           ( IWN_FLG_NEED_PHY_CALIB_DC
-           | IWN_FLG_NEED_PHY_CALIB_LO
+           ( IWN_FLG_NEED_PHY_CALIB_LO
+           | IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC
            | IWN_FLG_NEED_PHY_CALIB_TX_IQ
-           | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+           | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+           ),
        .support_hostap = false,
        .no_multi_vaps = true,
        .additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
-       .bt_mode = IWN_BT_NONE,
+       /* XXX 1000 - no BT */
+       .bt_mode = IWN_BT_SIMPLE,
 };
 static const struct iwn_base_params iwn_6000_base_params = {
        .pll_cfg_val = 0,