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

Commit e61444d9 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents a252e749 6a213afd

drivers/net/wireless/ath/ath5k/led.c

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ static const struct pci_device_id ath5k_led_devices[] = { 
	{ ATH_SDEVICE(PCI_VENDOR_ID_HP, 0x0137b), ATH_LED(3, 1) },

	/* IBM-specific AR5212 (all others) */

	{ PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_IBM), ATH_LED(0, 0) },

	/* Dell Vostro A860 (shahar@shahar-or.co.il) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_QMI, 0x0112), ATH_LED(3, 0) },

	{ }

};

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

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
				&txq->axq_q, lastbf->list.prev);



		txq->axq_depth--;

		txok = (ds->ds_txstat.ts_status == 0);

		txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);

		txq->axq_tx_inprogress = false;

		spin_unlock_bh(&txq->axq_lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) 
	if (priv->stations[sta_id].tid[tid].agg.state ==

				IWL_EMPTYING_HW_QUEUE_ADDBA) {

		IWL_DEBUG_HT(priv, "AGG stop before setup done\n");

		ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid);

		ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);

		priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;

		return 0;

	}

drivers/net/wireless/mwl8k.c

+163 −164

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/orinoco/hermes_dld.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ int hermesi_program_init(hermes_t *hw, u32 offset) 
	if (err)

		return err;



	pr_debug(KERN_DEBUG PFX "Enabling volatile, EP 0x%08x\n", offset);

	pr_debug(PFX "Enabling volatile, EP 0x%08x\n", offset);

	err = hermes_doicmd_wait(hw,

				 HERMES_PROGRAM_ENABLE_VOLATILE,

				 offset & 0xFFFFu,