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

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

Merge branch 'wireless-next-2.6' of... 

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

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

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ static int iwlagn_rxon_disconn(struct iwl_priv *priv, 
	 * keys, so we have to restore those afterwards.

	 */

	iwl_clear_ucode_stations(priv, ctx);

	/* update -- might need P2P now */

	iwl_update_bcast_station(priv, ctx);

	iwl_restore_stations(priv, ctx);

	ret = iwl_restore_default_wep_keys(priv, ctx);

	if (ret) {

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

+11 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "iwl-agn.h"



static struct iwl_link_quality_cmd *

iwl_sta_alloc_lq(struct iwl_priv *priv, u8 sta_id)

iwl_sta_alloc_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, u8 sta_id)

{

	int i, r;

	struct iwl_link_quality_cmd *link_cmd;
@@ -47,10 +47,15 @@ iwl_sta_alloc_lq(struct iwl_priv *priv, u8 sta_id) 
		IWL_ERR(priv, "Unable to allocate memory for LQ cmd.\n");

		return NULL;

	}



	lockdep_assert_held(&priv->mutex);



	/* Set up the rate scaling to start at selected rate, fall back

	 * all the way down to 1M in IEEE order, and then spin on 1M */

	if (priv->band == IEEE80211_BAND_5GHZ)

		r = IWL_RATE_6M_INDEX;

	else if (ctx && ctx->vif && ctx->vif->p2p)

		r = IWL_RATE_6M_INDEX;

	else

		r = IWL_RATE_1M_INDEX;
@@ -115,7 +120,7 @@ int iwlagn_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx 
	spin_unlock_irqrestore(&priv->sta_lock, flags);



	/* Set up default rate scaling table in device's station table */

	link_cmd = iwl_sta_alloc_lq(priv, sta_id);

	link_cmd = iwl_sta_alloc_lq(priv, ctx, sta_id);

	if (!link_cmd) {

		IWL_ERR(priv, "Unable to initialize rate scaling for station %pM.\n",

			addr);
@@ -554,7 +559,7 @@ int iwlagn_alloc_bcast_station(struct iwl_priv *priv, 
	priv->stations[sta_id].used |= IWL_STA_BCAST;

	spin_unlock_irqrestore(&priv->sta_lock, flags);



	link_cmd = iwl_sta_alloc_lq(priv, sta_id);

	link_cmd = iwl_sta_alloc_lq(priv, ctx, sta_id);

	if (!link_cmd) {

		IWL_ERR(priv,

			"Unable to initialize rate scaling for bcast station.\n");
@@ -574,14 +579,14 @@ int iwlagn_alloc_bcast_station(struct iwl_priv *priv, 
 * Only used by iwlagn. Placed here to have all bcast station management

 * code together.

 */

static int iwl_update_bcast_station(struct iwl_priv *priv,

int iwl_update_bcast_station(struct iwl_priv *priv,

			     struct iwl_rxon_context *ctx)

{

	unsigned long flags;

	struct iwl_link_quality_cmd *link_cmd;

	u8 sta_id = ctx->bcast_sta_id;



	link_cmd = iwl_sta_alloc_lq(priv, sta_id);

	link_cmd = iwl_sta_alloc_lq(priv, ctx, sta_id);

	if (!link_cmd) {

		IWL_ERR(priv, "Unable to initialize rate scaling for bcast station.\n");

		return -ENOMEM;

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

+22 −4
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv) 
	struct iwl_host_cmd cmd = {

		.id = REPLY_TX_BEACON,

	};

	struct ieee80211_tx_info *info;

	u32 frame_size;

	u32 rate_flags;

	u32 rate;
@@ -172,14 +173,31 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv) 
			   frame_size);



	/* Set up packet rate and flags */

	rate = iwl_rate_get_lowest_plcp(priv, priv->beacon_ctx);

	info = IEEE80211_SKB_CB(priv->beacon_skb);



	/*

	 * Let's set up the rate at least somewhat correctly;

	 * it will currently not actually be used by the uCode,

	 * it uses the broadcast station's rate instead.

	 */

	if (info->control.rates[0].idx < 0 ||

	    info->control.rates[0].flags & IEEE80211_TX_RC_MCS)

		rate = 0;

	else

		rate = info->control.rates[0].idx;



	priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,

					      priv->hw_params.valid_tx_ant);

	rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant);

	if ((rate >= IWL_FIRST_CCK_RATE) && (rate <= IWL_LAST_CCK_RATE))



	/* In mac80211, rates for 5 GHz start at 0 */

	if (info->band == IEEE80211_BAND_5GHZ)

		rate += IWL_FIRST_OFDM_RATE;

	else if (rate >= IWL_FIRST_CCK_RATE && rate <= IWL_LAST_CCK_RATE)

		rate_flags |= RATE_MCS_CCK_MSK;

	tx_beacon_cmd->tx.rate_n_flags = iwl_hw_set_rate_n_flags(rate,

			rate_flags);



	tx_beacon_cmd->tx.rate_n_flags =

			iwl_hw_set_rate_n_flags(rate, rate_flags);



	/* Submit command */

	cmd.len[0] = sizeof(*tx_beacon_cmd);

drivers/net/wireless/iwlwifi/iwl-agn.h

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta, 
int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,

			int tid);

void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt);

int iwl_update_bcast_station(struct iwl_priv *priv,

			     struct iwl_rxon_context *ctx);

int iwl_update_bcast_stations(struct iwl_priv *priv);

void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,

			   struct ieee80211_vif *vif,

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

+0 −13
Original line number Diff line number Diff line
@@ -526,19 +526,6 @@ int iwl_full_rxon_required(struct iwl_priv *priv, 
	return 0;

}



u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx)

{

	/*

	 * Assign the lowest rate -- should really get this from

	 * the beacon skb from mac80211.

	 */

	if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK)

		return IWL_RATE_1M_PLCP;

	else

		return IWL_RATE_6M_PLCP;

}



static void _iwl_set_rxon_ht(struct iwl_priv *priv,

			     struct iwl_ht_config *ht_conf,

			     struct iwl_rxon_context *ctx)