Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (a1b97440) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/airo.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -5922,16 +5922,15 @@ static int airo_set_essid(struct net_device *dev,
		/* Just send an empty SSID list */
		memset(&SSID_rid, 0, sizeof(SSID_rid));
		} else {
		int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
		unsigned index = (dwrq->flags & IW_ENCODE_INDEX) - 1;

		/* Check the size of the string */
		if(dwrq->length > IW_ESSID_MAX_SIZE) {
		if (dwrq->length > IW_ESSID_MAX_SIZE)
		return -E2BIG ;
		}

		/* Check if index is valid */
		if((index < 0) \|\| (index >= 4)) {
		if (index >= ARRAY_SIZE(SSID_rid.ssids))
		return -EINVAL;
		}

		/* Set the SSID */
		memset(SSID_rid.ssids[index].ssid, 0,
		@@ -6819,7 +6818,7 @@ static int airo_set_txpow(struct net_device *dev,
		return -EINVAL;
		}
		clear_bit (FLAG_RADIO_OFF, &local->flags);
		for (i = 0; cap_rid.txPowerLevels[i] && (i < 8); i++)
		for (i = 0; i < 8 && cap_rid.txPowerLevels[i]; i++)
		if (v == cap_rid.txPowerLevels[i]) {
		readConfigRid(local, 1);
		local->config.txPower = v;

drivers/net/wireless/ath/ath9k/eeprom.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -460,7 +460,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
		integer = swab32(eep->modalHeader.antCtrlCommon);
		eep->modalHeader.antCtrlCommon = integer;

		for (i = 0; i < AR5416_MAX_CHAINS; i++) {
		for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) {
		integer = swab32(eep->modalHeader.antCtrlChain[i]);
		eep->modalHeader.antCtrlChain[i] = integer;
		}
		@@ -914,7 +914,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
		ctlMode, numCtlModes, isHt40CtlMode,
		(pCtlMode[ctlMode] & EXT_ADDITIVE));

		for (i = 0; (i < AR5416_NUM_CTLS) &&
		for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) &&
		pEepData->ctlIndex[i]; i++) {
		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
		" LOOP-Ctlidx %d: cfgCtl 0x%2.2x "

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ enum iwl3945_antenna {
		#define IWL_TX_FIFO_NONE 7

		/* Minimum number of queues. MAX_NUM is defined in hw specific files */
		#define IWL_MIN_NUM_QUEUES 4
		#define IWL39_MIN_NUM_QUEUES 4

		#define IEEE80211_DATA_LEN 2304
		#define IEEE80211_4ADDR_LEN 30

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -258,8 +258,10 @@ struct iwl_channel_info {
		#define IWL_TX_FIFO_HCCA_2 6
		#define IWL_TX_FIFO_NONE 7

		/* Minimum number of queues. MAX_NUM is defined in hw specific files */
		#define IWL_MIN_NUM_QUEUES 4
		/* Minimum number of queues. MAX_NUM is defined in hw specific files.
		* Set the minimum to accommodate the 4 standard TX queues, 1 command
		* queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */
		#define IWL_MIN_NUM_QUEUES 10

		/* Power management (not Tx power) structures */

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -720,8 +720,6 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)
		goto drop_unlock;
		}

		spin_unlock_irqrestore(&priv->lock, flags);

		hdr_len = ieee80211_hdrlen(fc);

		/* Find (or create) index into station table for destination station */
		@@ -729,7 +727,7 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)
		if (sta_id == IWL_INVALID_STATION) {
		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
		hdr->addr1);
		goto drop;
		goto drop_unlock;
		}

		IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
		@@ -750,14 +748,17 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)
		txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
		swq_id = iwl_virtual_agg_queue_num(swq_id, txq_id);
		}
		priv->stations[sta_id].tid[tid].tfds_in_queue++;
		}

		txq = &priv->txq[txq_id];
		q = &txq->q;
		txq->swq_id = swq_id;

		spin_lock_irqsave(&priv->lock, flags);
		if (unlikely(iwl_queue_space(q) < q->high_mark))
		goto drop_unlock;

		if (ieee80211_is_data_qos(fc))
		priv->stations[sta_id].tid[tid].tfds_in_queue++;

		/* Set up driver data for this TFD */
		memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
		@@ -902,7 +903,6 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)

		drop_unlock:
		spin_unlock_irqrestore(&priv->lock, flags);
		drop:
		return -1;
		}
		EXPORT_SYMBOL(iwl_tx_skb);
		@@ -1171,6 +1171,8 @@ int iwl_tx_agg_start(struct iwl_priv priv, const u8 ra, u16 tid, u16 *ssn)
		IWL_ERR(priv, "Start AGG on invalid station\n");
		return -ENXIO;
		}
		if (unlikely(tid >= MAX_TID_COUNT))
		return -EINVAL;

		if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {
		IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");