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

Commit ce300c7f 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 8266d712 9e3bd919

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3502,9 +3502,9 @@ F: drivers/net/mv643xx_eth.* 
F:	include/linux/mv643xx.h



MARVELL MWL8K WIRELESS DRIVER

M:	Lennert Buytenhek <buytenh@marvell.com>

M:	Lennert Buytenhek <buytenh@wantstofly.org>

L:	linux-wireless@vger.kernel.org

S:	Supported

S:	Maintained

F:	drivers/net/wireless/mwl8k.c



MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER

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

+10 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,16 @@ static void ath9k_hw_override_ini(struct ath_hw *ah, 
	 * Necessary to avoid issues on AR5416 2.0

	 */

	REG_WRITE(ah, 0x9800 + (651 << 2), 0x11);



	/*

	 * Disable RIFS search on some chips to avoid baseband

	 * hang issues.

	 */

	if (AR_SREV_9100(ah) || AR_SREV_9160(ah)) {

		val = REG_READ(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS);

		val &= ~AR_PHY_RIFS_INIT_DELAY;

		REG_WRITE(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS, val);

	}

}



static u32 ath9k_hw_def_ini_fixup(struct ath_hw *ah,

drivers/net/wireless/ath/ath9k/phy.h

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ bool ath9k_hw_set_rf_regs(struct ath_hw *ah, 


#define AR_PHY_HEAVY_CLIP_ENABLE         0x99E0



#define AR_PHY_HEAVY_CLIP_FACTOR_RIFS    0x99EC

#define AR_PHY_RIFS_INIT_DELAY         0x03ff0000



#define AR_PHY_M_SLEEP      0x99f0

#define AR_PHY_REFCLKDLY    0x99f4

#define AR_PHY_REFCLKPD     0x99f8

drivers/net/wireless/b43/Kconfig

+16 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config B43 
	depends on SSB_POSSIBLE && MAC80211 && HAS_DMA

	select SSB

	select FW_LOADER

	select SSB_BLOCKIO

	---help---

	  b43 is a driver for the Broadcom 43xx series wireless devices.
@@ -79,6 +78,14 @@ config B43_SDIO 


	  If unsure, say N.



#Data transfers to the device via PIO. We want it as a fallback even

# if we can do DMA.

config B43_PIO

	bool

	depends on B43

	select SSB_BLOCKIO

	default y



config B43_NPHY

	bool "Pre IEEE 802.11n support (BROKEN)"

	depends on B43 && EXPERIMENTAL && BROKEN
@@ -130,4 +137,12 @@ config B43_DEBUG 
	  for production use.

	  Only say Y, if you are debugging a problem in the b43 driver sourcecode.



config B43_FORCE_PIO

	bool "Force usage of PIO instead of DMA"

	depends on B43 && B43_DEBUG

	---help---

	  This will disable DMA and always enable PIO instead.



	  Say N!

	  This is only for debugging the PIO engine code. You do

	  _NOT_ want to enable this.

drivers/net/wireless/b43/b43.h

+7 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ struct b43_wldev { 
	bool radio_hw_enable;	/* saved state of radio hardware enabled state */

	bool qos_enabled;		/* TRUE, if QoS is used. */

	bool hwcrypto_enabled;		/* TRUE, if HW crypto acceleration is enabled. */

	bool use_pio;			/* TRUE if next init should use PIO */



	/* PHY/Radio device. */

	struct b43_phy phy;
@@ -886,6 +887,12 @@ static inline bool b43_using_pio_transfers(struct b43_wldev *dev) 
	return dev->__using_pio_transfers;

}



#ifdef CONFIG_B43_FORCE_PIO

# define B43_PIO_DEFAULT 1

#else

# define B43_PIO_DEFAULT 0

#endif



/* Message printing */

void b43info(struct b43_wl *wl, const char *fmt, ...)

    __attribute__ ((format(printf, 2, 3)));