Merge branch 'master' of... (dbd717e3) · Commits · e / devices / android_kernel_teracube_emerald

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

+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

+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;
		}

+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;

+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;
		}