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

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

Conflicts:
	net/mac80211/scan.c
parents 5ffaf8a3 c0ce77b8

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

+3 −4
Original line number Diff line number Diff line
@@ -812,12 +812,11 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah) 
	}

}



static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah)

static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah)

{

	u32 i, j;



	if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&

	    test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) {

	if (ah->hw_version.devid == AR9280_DEVID_PCI) {



		/* EEPROM Fixup */

		for (i = 0; i < ah->iniModes.ia_rows; i++) {
@@ -937,7 +936,7 @@ int ath9k_hw_init(struct ath_hw *ah) 
	if (r)

		return r;



	ath9k_hw_init_11a_eeprom_fix(ah);

	ath9k_hw_init_eeprom_fix(ah);



	r = ath9k_hw_init_macaddr(ah);

	if (r) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1472,10 +1472,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 
	    (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {

		ath9k_ps_wakeup(sc);

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);

		ath_beacon_return(sc, avp);

		ath9k_ps_restore(sc);

	}



	ath_beacon_return(sc, avp);

	sc->sc_flags &= ~SC_OP_BEACONS;



	for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {

drivers/net/wireless/b43/b43.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#define B43_MMIO_TSF_2			0x636	/* core rev < 3 only */

#define B43_MMIO_TSF_3			0x638	/* core rev < 3 only */

#define B43_MMIO_RNG			0x65A

#define B43_MMIO_IFSSLOT		0x684	/* Interframe slot time */

#define B43_MMIO_IFSCTL			0x688 /* Interframe space control */

#define  B43_MMIO_IFSCTL_USE_EDCF	0x0004

#define B43_MMIO_POWERUP_DELAY		0x6A8

drivers/net/wireless/b43/main.c

+10 −3
Original line number Diff line number Diff line
@@ -637,10 +637,17 @@ static void b43_upload_card_macaddress(struct b43_wldev *dev) 
static void b43_set_slot_time(struct b43_wldev *dev, u16 slot_time)

{

	/* slot_time is in usec. */

	if (dev->phy.type != B43_PHYTYPE_G)

	/* This test used to exit for all but a G PHY. */

	if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)

		return;

	b43_write16(dev, 0x684, 510 + slot_time);

	b43_shm_write16(dev, B43_SHM_SHARED, 0x0010, slot_time);

	b43_write16(dev, B43_MMIO_IFSSLOT, 510 + slot_time);

	/* Shared memory location 0x0010 is the slot time and should be

	 * set to slot_time; however, this register is initially 0 and changing

	 * the value adversely affects the transmit rate for BCM4311

	 * devices. Until this behavior is unterstood, delete this step

	 *

	 * b43_shm_write16(dev, B43_SHM_SHARED, 0x0010, slot_time);

	 */

}



static void b43_short_slot_timing_enable(struct b43_wldev *dev)

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

+1 −0
Original line number Diff line number Diff line
@@ -2787,6 +2787,7 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) 
		if ((le16_to_cpu(priv->staging_rxon.channel) != ch))

			priv->staging_rxon.flags = 0;



		iwl_set_rxon_ht(priv, ht_conf);

		iwl_set_rxon_channel(priv, conf->channel);



		iwl_set_flags_for_band(priv, conf->channel->band);