Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4c69f7 authored by John W. Linville's avatar John W. Linville
Browse files

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

parents 4a0c3d9f e03bbb62

drivers/net/wireless/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv) 
		goto done;

	}

	IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans);

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

done:

	ieee80211_wake_queues(priv->hw);

	mutex_unlock(&priv->mutex);

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop) 
		}

	}

	IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans);

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

drivers/net/wireless/iwlwifi/dvm/main.c

+12 −0
Original line number Diff line number Diff line
@@ -2053,6 +2053,17 @@ static bool iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) 
	return false;

}



static void iwl_napi_add(struct iwl_op_mode *op_mode,

			 struct napi_struct *napi,

			 struct net_device *napi_dev,

			 int (*poll)(struct napi_struct *, int),

			 int weight)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);



	ieee80211_napi_add(priv->hw, napi, napi_dev, poll, weight);

}



static const struct iwl_op_mode_ops iwl_dvm_ops = {

	.start = iwl_op_mode_dvm_start,

	.stop = iwl_op_mode_dvm_stop,
@@ -2065,6 +2076,7 @@ static const struct iwl_op_mode_ops iwl_dvm_ops = { 
	.cmd_queue_full = iwl_cmd_queue_full,

	.nic_config = iwl_nic_config,

	.wimax_active = iwl_wimax_active,

	.napi_add = iwl_napi_add,

};



/*****************************************************************************

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

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static const struct iwl_base_params iwl1000_base_params = { 
	.led_compensation = 51,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

	.max_event_log_size = 128,

	.scd_chain_ext_wa = true,

};



static const struct iwl_ht_params iwl1000_ht_params = {

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

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static const struct iwl_base_params iwl2000_base_params = { 
	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = false, /* TODO: fix bugs using this feature */

	.scd_chain_ext_wa = true,

};
@@ -88,6 +89,7 @@ static const struct iwl_base_params iwl2030_base_params = { 
	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = false, /* TODO: fix bugs using this feature */

	.scd_chain_ext_wa = true,

};



static const struct iwl_ht_params iwl2000_ht_params = {