Commit 052633c1 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-08-04' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-08-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* Deprecate -10.ucode
* Clean ups towards multiple Rx queues
* Add support for longer CMD IDs. This will be required by new
	firmwares since we are getting close to the u8 limit.
* bugfixes for the D0i3 power state
* Add basic support for FTM
* More random that doesn't really stand out
parents 5d7e73ba 75118fdb

drivers/net/wireless/iwlwifi/dvm/agn.h

+6 −13
Original line number Diff line number Diff line
@@ -122,9 +122,8 @@ static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd) 
void iwl_down(struct iwl_priv *priv);

void iwl_cancel_deferred_work(struct iwl_priv *priv);

void iwlagn_prepare_restart(struct iwl_priv *priv);

int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode,

				 struct iwl_rx_cmd_buffer *rxb,

				 struct iwl_device_cmd *cmd);

void iwl_rx_dispatch(struct iwl_op_mode *op_mode,

		     struct iwl_rx_cmd_buffer *rxb);



bool iwl_check_for_ct_kill(struct iwl_priv *priv);
@@ -216,11 +215,9 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		       struct ieee80211_sta *sta, u16 tid);

int iwlagn_tx_agg_flush(struct iwl_priv *priv, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta, u16 tid);

int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

				   struct iwl_rx_cmd_buffer *rxb,

				   struct iwl_device_cmd *cmd);

int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,

			       struct iwl_device_cmd *cmd);

void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

				   struct iwl_rx_cmd_buffer *rxb);

void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb);



static inline u32 iwl_tx_status_to_mac80211(u32 status)

{
@@ -277,9 +274,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 


/* bt coex */

void iwlagn_send_advance_bt_config(struct iwl_priv *priv);

int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *cmd);

void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv);

void iwlagn_bt_setup_deferred_work(struct iwl_priv *priv);

void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv);
@@ -332,8 +326,7 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx, 


int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,

		    struct iwl_link_quality_cmd *lq, u8 flags, bool init);

int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,

			       struct iwl_device_cmd *cmd);

void iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb);

int iwl_sta_update_ht(struct iwl_priv *priv, struct iwl_rxon_context *ctx,

		      struct ieee80211_sta *sta);

drivers/net/wireless/iwlwifi/dvm/dev.h

+2 −3
Original line number Diff line number Diff line
@@ -678,9 +678,8 @@ struct iwl_priv { 
	enum ieee80211_band band;

	u8 valid_contexts;



	int (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,

				       struct iwl_rx_cmd_buffer *rxb,

				       struct iwl_device_cmd *cmd);

	void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,

				       struct iwl_rx_cmd_buffer *rxb);



	struct iwl_notif_wait_data notif_wait;

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

+3 −5
Original line number Diff line number Diff line
@@ -659,9 +659,8 @@ static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv, 
	return need_update;

}



int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *cmd)

static void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

					 struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_bt_coex_profile_notif *coex = (void *)pkt->data;
@@ -669,7 +668,7 @@ int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 


	if (priv->bt_enable_flag == IWLAGN_BT_FLAG_COEX_MODE_DISABLED) {

		/* bt coex disabled */

		return 0;

		return;

	}



	IWL_DEBUG_COEX(priv, "BT Coex notification:\n");
@@ -714,7 +713,6 @@ int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 
	/* FIXME: based on notification, adjust the prio_boost */



	priv->bt_ci_compliance = coex->bt_ci_compliance;

	return 0;

}



void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv)

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

+13 −1
Original line number Diff line number Diff line
@@ -250,12 +250,24 @@ static int __iwl_up(struct iwl_priv *priv) 
		}

	}



	ret = iwl_trans_start_hw(priv->trans);

	if (ret) {

		IWL_ERR(priv, "Failed to start HW: %d\n", ret);

		goto error;

	}



	ret = iwl_run_init_ucode(priv);

	if (ret) {

		IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);

		goto error;

	}



	ret = iwl_trans_start_hw(priv->trans);

	if (ret) {

		IWL_ERR(priv, "Failed to start HW: %d\n", ret);

		goto error;

	}



	ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR);

	if (ret) {

		IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);
@@ -432,7 +444,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
		u32 error_id;

	} err_info;

	struct iwl_notification_wait status_wait;

	static const u8 status_cmd[] = {

	static const u16 status_cmd[] = {

		REPLY_WOWLAN_GET_STATUS,

	};

	struct iwlagn_wowlan_status status_data = {};

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

+21 −30
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv, 
/*

 * Try to switch to new modulation mode from legacy

 */

static int rs_move_legacy_other(struct iwl_priv *priv,

static void rs_move_legacy_other(struct iwl_priv *priv,

				 struct iwl_lq_sta *lq_sta,

				 struct ieee80211_conf *conf,

				 struct ieee80211_sta *sta,
@@ -1575,7 +1575,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv, 


	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;



out:

	lq_sta->search_better_tbl = 1;
@@ -1584,14 +1584,12 @@ out: 
		tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;

	return 0;



}



/*

 * Try to switch to new modulation mode from SISO

 */

static int rs_move_siso_to_other(struct iwl_priv *priv,

static void rs_move_siso_to_other(struct iwl_priv *priv,

				  struct iwl_lq_sta *lq_sta,

				  struct ieee80211_conf *conf,

				  struct ieee80211_sta *sta, int index)
@@ -1747,7 +1745,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;



 out:

	lq_sta->search_better_tbl = 1;
@@ -1756,14 +1754,12 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, 
		tbl->action = IWL_SISO_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;

}



/*

 * Try to switch to new modulation mode from MIMO2

 */

static int rs_move_mimo2_to_other(struct iwl_priv *priv,

static void rs_move_mimo2_to_other(struct iwl_priv *priv,

				   struct iwl_lq_sta *lq_sta,

				   struct ieee80211_conf *conf,

				   struct ieee80211_sta *sta, int index)
@@ -1917,7 +1913,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;

 out:

	lq_sta->search_better_tbl = 1;

	tbl->action++;
@@ -1926,14 +1922,12 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, 
	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;



}



/*

 * Try to switch to new modulation mode from MIMO3

 */

static int rs_move_mimo3_to_other(struct iwl_priv *priv,

static void rs_move_mimo3_to_other(struct iwl_priv *priv,

				   struct iwl_lq_sta *lq_sta,

				   struct ieee80211_conf *conf,

				   struct ieee80211_sta *sta, int index)
@@ -2093,7 +2087,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;

 out:

	lq_sta->search_better_tbl = 1;

	tbl->action++;
@@ -2101,9 +2095,6 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, 
		tbl->action = IWL_MIMO3_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;



}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE