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

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

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



From John:

Another batch of fixes intended for 3.4...

First up, we have a minor signedness fix for libertas from Amitkumar
Karwar.  Next, Arend gives us a brcm80211 fix for correctly enabling
Tx FIFOs on channels 12 and 13.  Bing Zhao gives us some register
address corrections for mwifiex.  Felix give us a trio of fixes --
one for ath9k to wake the hardware properly from full sleep, one for
mac80211 to properly handle packets in cooked monitor mode, and one
for ensuring that the proper HT mode selection is honored.

Hauke gives us a bcma fix for handling the lack of an sprom.  Jonathon
Bither gives us an ath5k fix for a missing THIS_MODULE build issue,
and another ath5k fix for an io mapping leak.  Lukasz Kucharczyk
fixes a bitwise check in cfg80211, and Sujith gives us an ath9k fix
for assigning sequence numbers for fragmented frames.  Finally, we
have a MAINTAINERS change from Wey-Yi Guy -- congrats to Johannes
Berg for taking the lead on iwlwifi. :-)

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b922934d dbd717e3

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3592,6 +3592,7 @@ S: Supported 
F:	drivers/net/wireless/iwlegacy/



INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

drivers/bcma/sprom.c

+5 −2
Original line number Diff line number Diff line
@@ -404,16 +404,19 @@ int bcma_sprom_get(struct bcma_bus *bus) 
		return -EOPNOTSUPP;



	if (!bcma_sprom_ext_available(bus)) {

		bool sprom_onchip;



		/*

		 * External SPROM takes precedence so check

		 * on-chip OTP only when no external SPROM

		 * is present.

		 */

		if (bcma_sprom_onchip_available(bus)) {

		sprom_onchip = bcma_sprom_onchip_available(bus);

		if (sprom_onchip) {

			/* determine offset */

			offset = bcma_sprom_onchip_offset(bus);

		}

		if (!offset) {

		if (!offset || !sprom_onchip) {

			/*

			 * Maybe there is no SPROM on the device?

			 * Now we ask the arch code if there is some sprom

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

+5 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/nl80211.h>

#include <linux/platform_device.h>

#include <linux/etherdevice.h>

#include <linux/export.h>

#include <ar231x_platform.h>

#include "ath5k.h"

#include "debug.h"
@@ -119,7 +120,7 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	if (res == NULL) {

		dev_err(&pdev->dev, "no IRQ resource found\n");

		ret = -ENXIO;

		goto err_out;

		goto err_iounmap;

	}



	irq = res->start;
@@ -128,7 +129,7 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	if (hw == NULL) {

		dev_err(&pdev->dev, "no memory for ieee80211_hw\n");

		ret = -ENOMEM;

		goto err_out;

		goto err_iounmap;

	}



	ah = hw->priv;
@@ -185,6 +186,8 @@ static int ath_ahb_probe(struct platform_device *pdev) 
 err_free_hw:

	ieee80211_free_hw(hw);

	platform_set_drvdata(pdev, NULL);

 err_iounmap:

        iounmap(mem);

 err_out:

	return ret;

}

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

+8 −1
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ieee80211_conf *conf = &hw->conf;

	bool reset_channel = false;



	ath9k_ps_wakeup(sc);

	mutex_lock(&sc->mutex);
@@ -1556,6 +1557,12 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);

		if (sc->ps_idle)

			ath_cancel_work(sc);

		else

			/*

			 * The chip needs a reset to properly wake up from

			 * full sleep

			 */

			reset_channel = ah->chip_fullsleep;

	}



	/*
@@ -1584,7 +1591,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		}

	}



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {

	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {

		struct ieee80211_channel *curchan = hw->conf.channel;

		int pos = curchan->hw_value;

		int old_pos = -1;

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

+9 −1
Original line number Diff line number Diff line
@@ -1820,6 +1820,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, 
	struct ath_frame_info *fi = get_frame_info(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ath_buf *bf;

	int fragno;

	u16 seqno;



	bf = ath_tx_get_buffer(sc);
@@ -1831,9 +1832,16 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, 
	ATH_TXBUF_RESET(bf);



	if (tid) {

		fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;

		seqno = tid->seq_next;

		hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);



		if (fragno)

			hdr->seq_ctrl |= cpu_to_le16(fragno);



		if (!ieee80211_has_morefrags(hdr->frame_control))

			INCR(tid->seq_next, IEEE80211_SEQ_MAX);



		bf->bf_state.seqno = seqno;

	}