Merge branch 'wireless-next-2.6' of... (dbd98308) · Commits · github.com / kvm-riscv / linux

drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -270,7 +270,6 @@ static struct iwl_base_params iwl1000_base_params = {
		.ucode_tracing = true,
		.sensitivity_calib_by_driver = true,
		.chain_noise_calib_by_driver = true,
		.supports_idle = true,
		};
		static struct iwl_ht_params iwl1000_ht_params = {
		.ht_greenfield_support = true,

drivers/net/wireless/iwlwifi/iwl-2000.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -97,6 +97,10 @@ static void iwl2000_nic_config(struct iwl_priv *priv)
		CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI \|
		CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);

		if (priv->cfg->iq_invert)
		iwl_set_bit(priv, CSR_GP_DRIVER_REG,
		CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);

		}

		static struct iwl_sensitivity_ranges iwl2000_sensitivity = {
		@@ -364,7 +368,6 @@ static struct iwl_base_params iwl2000_base_params = {
		.shadow_ram_support = true,
		.led_compensation = 51,
		.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
		.supports_idle = true,
		.adv_thermal_throttle = true,
		.support_ct_kill_exit = true,
		.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
		@@ -389,7 +392,6 @@ static struct iwl_base_params iwl2030_base_params = {
		.shadow_ram_support = true,
		.led_compensation = 57,
		.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
		.supports_idle = true,
		.adv_thermal_throttle = true,
		.support_ct_kill_exit = true,
		.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
		@@ -428,7 +430,8 @@ static struct iwl_bt_params iwl2030_bt_params = {
		.base_params = &iwl2000_base_params, \
		.need_dc_calib = true, \
		.need_temp_offset_calib = true, \
		.led_mode = IWL_LED_RF_STATE \
		.led_mode = IWL_LED_RF_STATE, \
		.iq_invert = true \

		struct iwl_cfg iwl2000_2bgn_cfg = {
		.name = "2000 Series 2x2 BGN",
		@@ -454,17 +457,18 @@ struct iwl_cfg iwl2000_2bg_cfg = {
		.need_dc_calib = true, \
		.need_temp_offset_calib = true, \
		.led_mode = IWL_LED_RF_STATE, \
		.adv_pm = true \
		.adv_pm = true, \
		.iq_invert = true \

		struct iwl_cfg iwl2030_2bgn_cfg = {
		.name = "2000 Series 2x2 BGN/BT",
		IWL_DEVICE_2000,
		IWL_DEVICE_2030,
		.ht_params = &iwl2000_ht_params,
		};

		struct iwl_cfg iwl2030_2bg_cfg = {
		.name = "2000 Series 2x2 BG/BT",
		IWL_DEVICE_2000,
		IWL_DEVICE_2030,
		};

		#define IWL_DEVICE_6035 \

drivers/net/wireless/iwlwifi/iwl-4965.c

+24 −8

Original line number	Diff line number	Diff line
		@@ -251,14 +251,6 @@ static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv)
		*/
		static void iwl4965_init_alive_start(struct iwl_priv *priv)
		{
		/* Check alive response for "valid" sign from uCode */
		if (priv->card_alive_init.is_valid != UCODE_VALID_OK) {
		/* We had an error bringing up the hardware, so take it
		* all the way back down so we can try again */
		IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n");
		goto restart;
		}

		/* Bootstrap uCode has loaded initialize uCode ... verify inst image.
		* This is a paranoid check, because we would not have gotten the
		* "initialize" alive if code weren't properly loaded. */
		@@ -2274,6 +2266,29 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
		spin_unlock_irqrestore(&priv->sta_lock, flags);
		}

		static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		struct iwl4965_beacon_notif beacon = (void )pkt->u.raw;
		#ifdef CONFIG_IWLWIFI_DEBUG
		u8 rate = iwl_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);

		IWL_DEBUG_RX(priv, "beacon status %#x, retries:%d ibssmgr:%d "
		"tsf:0x%.8x%.8x rate:%d\n",
		le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
		beacon->beacon_notify_hdr.failure_frame,
		le32_to_cpu(beacon->ibss_mgr_status),
		le32_to_cpu(beacon->high_tsf),
		le32_to_cpu(beacon->low_tsf), rate);
		#endif

		priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);

		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
		queue_work(priv->workqueue, &priv->beacon_update);
		}

		static int iwl4965_calc_rssi(struct iwl_priv *priv,
		struct iwl_rx_phy_res *rx_resp)
		{
		@@ -2316,6 +2331,7 @@ static void iwl4965_rx_handler_setup(struct iwl_priv *priv)
		priv->rx_handlers[REPLY_RX] = iwlagn_rx_reply_rx;
		/* Tx response */
		priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;
		priv->rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;

		/* set up notification wait support */
		spin_lock_init(&priv->_agn.notif_wait_lock);

drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -479,7 +479,6 @@ static struct iwl_base_params iwl6000_base_params = {
		.shadow_ram_support = true,
		.led_compensation = 51,
		.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
		.supports_idle = true,
		.adv_thermal_throttle = true,
		.support_ct_kill_exit = true,
		.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
		@@ -503,7 +502,6 @@ static struct iwl_base_params iwl6050_base_params = {
		.shadow_ram_support = true,
		.led_compensation = 51,
		.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
		.supports_idle = true,
		.adv_thermal_throttle = true,
		.support_ct_kill_exit = true,
		.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
		@@ -526,7 +524,6 @@ static struct iwl_base_params iwl6000_g2_base_params = {
		.shadow_ram_support = true,
		.led_compensation = 57,
		.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
		.supports_idle = true,
		.adv_thermal_throttle = true,
		.support_ct_kill_exit = true,
		.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -1863,21 +1863,6 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
		if (iwl_send_cmd_pdu(priv, REPLY_BT_CONFIG, sizeof(bt_cmd), &bt_cmd))
		IWL_ERR(priv, "failed to send BT Coex Config\n");

		/*
		* When we are doing a restart, need to also reconfigure BT
		* SCO to the device. If not doing a restart, bt_sco_active
		* will always be false, so there's no need to have an extra
		* variable to check for it.
		*/
		if (priv->bt_sco_active) {
		struct iwlagn_bt_sco_cmd sco_cmd = { .flags = 0 };

		if (priv->bt_sco_active)
		sco_cmd.flags \|= IWLAGN_BT_SCO_ACTIVE;
		if (iwl_send_cmd_pdu(priv, REPLY_BT_COEX_SCO,
		sizeof(sco_cmd), &sco_cmd))
		IWL_ERR(priv, "failed to send BT SCO command\n");
		}
		}

		static void iwlagn_bt_traffic_change_work(struct work_struct *work)
		@@ -2038,7 +2023,6 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
		unsigned long flags;
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		struct iwl_bt_coex_profile_notif *coex = &pkt->u.bt_coex_profile_notif;
		struct iwlagn_bt_sco_cmd sco_cmd = { .flags = 0 };
		struct iwl_bt_uart_msg *uart_msg = &coex->last_bt_uart_msg;

		IWL_DEBUG_NOTIF(priv, "BT Coex notification:\n");
		@@ -2069,15 +2053,6 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
		queue_work(priv->workqueue,
		&priv->bt_traffic_change_work);
		}
		if (priv->bt_sco_active !=
		(uart_msg->frame3 & BT_UART_MSG_FRAME3SCOESCO_MSK)) {
		priv->bt_sco_active = uart_msg->frame3 &
		BT_UART_MSG_FRAME3SCOESCO_MSK;
		if (priv->bt_sco_active)
		sco_cmd.flags \|= IWLAGN_BT_SCO_ACTIVE;
		iwl_send_cmd_pdu_async(priv, REPLY_BT_COEX_SCO,
		sizeof(sco_cmd), &sco_cmd, NULL);
		}
		}

		iwlagn_set_kill_msk(priv, uart_msg);