tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

John W. Linville 5807bae7 a13c8f31

+6 -5
+1
drivers/net/wireless/iwlwifi/iwl-3945.c
··· 2753 2753 2754 2754 static struct iwl_base_params iwl3945_base_params = { 2755 2755 .eeprom_size = IWL3945_EEPROM_IMG_SIZE, 2756 + .num_of_queues = IWL39_NUM_QUEUES, 2756 2757 .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL, 2757 2758 .set_l0s = false, 2758 2759 .use_bsm = true,
+5 -5
drivers/net/wireless/iwlwifi/iwl-agn.c
··· 2809 2809 goto restart; 2810 2810 } 2811 2811 2812 - if (priv->hw_params.calib_rt_cfg) 2813 - iwlagn_send_calib_cfg_rt(priv, priv->hw_params.calib_rt_cfg); 2814 - 2815 2812 2816 2813 /* After the ALIVE response, we can send host commands to the uCode */ 2817 2814 set_bit(STATUS_ALIVE, &priv->status); ··· 2824 2827 if (iwl_is_rfkill(priv)) 2825 2828 return; 2826 2829 2830 + /* download priority table before any calibration request */ 2827 2831 if (priv->cfg->bt_params && 2828 2832 priv->cfg->bt_params->advanced_bt_coexist) { 2829 2833 /* Configure Bluetooth device coexistence support */ ··· 2833 2835 priv->kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT; 2834 2836 priv->cfg->ops->hcmd->send_bt_config(priv); 2835 2837 priv->bt_valid = IWLAGN_BT_VALID_ENABLE_FLAGS; 2836 - if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC) 2837 - iwlagn_send_prio_tbl(priv); 2838 + iwlagn_send_prio_tbl(priv); 2838 2839 2839 2840 /* FIXME: w/a to force change uCode BT state machine */ 2840 2841 iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN, ··· 2841 2844 iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_CLOSE, 2842 2845 BT_COEX_PRIO_TBL_EVT_INIT_CALIB2); 2843 2846 } 2847 + if (priv->hw_params.calib_rt_cfg) 2848 + iwlagn_send_calib_cfg_rt(priv, priv->hw_params.calib_rt_cfg); 2849 + 2844 2850 ieee80211_wake_queues(priv->hw); 2845 2851 2846 2852 priv->active_rate = IWL_RATES_MASK;