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

Commit 044c18c9 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 3f2e8d9f 174b2496

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

+2 −2
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, 
		bf->bf_frmlen -= padsize;

	}



	if (conf_is_ht(&hw->conf) && !is_pae(skb))

	if (conf_is_ht(&hw->conf))

		bf->bf_state.bf_type |= BUF_HT;



	bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);
@@ -1701,7 +1701,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
			goto tx_done;

		}



		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

		if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {

			/*

			 * Try aggregation if it's a unicast data frame

			 * and the destination is HT capable.

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
@@ -628,10 +628,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
@@ -2744,6 +2744,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);

drivers/net/wireless/iwmc3200wifi/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static int iwm_mlme_update_bss_table(struct iwm_priv *iwm, u8 *buf, 
	}



	bss->bss = kzalloc(bss_len, GFP_KERNEL);

	if (!bss) {

	if (!bss->bss) {

		kfree(bss);

		IWM_ERR(iwm, "Couldn't allocate bss\n");

		return -ENOMEM;