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

Commit 2ba5e1fe 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-2.6

parents 62175c75 47960077

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6767,12 +6767,12 @@ S: Maintained 
F:	drivers/net/wireless/wl1251/*



WL1271 WIRELESS DRIVER

M:	Luciano Coelho <luciano.coelho@nokia.com>

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

F:	drivers/net/wireless/wl12xx/wl1271*

F:	drivers/net/wireless/wl12xx/

F:	include/linux/wl12xx.h



WL3501 WIRELESS PCMCIA CARD DRIVER

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

+2 −2
Original line number Diff line number Diff line
@@ -838,9 +838,9 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah) 
	for (i = 0; i < qmax; i++) {

		err = ath5k_hw_stop_tx_dma(ah, i);

		/* -EINVAL -> queue inactive */

		if (err != -EINVAL)

		if (err && err != -EINVAL)

			return err;

	}



	return err;

	return 0;

}

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

+1 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah, 
	if (!ah->ah_bwmode) {

		dur = ieee80211_generic_frame_duration(sc->hw,

						NULL, len, rate);

		return dur;

		return le16_to_cpu(dur);

	}



	bitrate = rate->bitrate;
@@ -265,8 +265,6 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah) 
		 * what rate we should choose to TX ACKs. */

		tx_time = ath5k_hw_get_frame_duration(ah, 10, rate);



		tx_time = le16_to_cpu(tx_time);



		ath5k_hw_reg_write(ah, tx_time, reg);



		if (!(rate->flags & IEEE80211_RATE_SHORT_PREAMBLE))

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

+1 −2
Original line number Diff line number Diff line
@@ -426,9 +426,8 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, 
		}



		/* WAR for ASPM system hang */

		if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) {

		if (AR_SREV_9285(ah) || AR_SREV_9287(ah))

			val |= (AR_WA_BIT6 | AR_WA_BIT7);

		}



		if (AR_SREV_9285E_20(ah))

			val |= AR_WA_BIT23;

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

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static void ath9k_deinit_priv(struct ath9k_htc_priv *priv) 
{

	ath9k_htc_exit_debug(priv->ah);

	ath9k_hw_deinit(priv->ah);

	tasklet_kill(&priv->swba_tasklet);

	tasklet_kill(&priv->rx_tasklet);

	tasklet_kill(&priv->tx_tasklet);

	kfree(priv->ah);

	priv->ah = NULL;

}