Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (9d55911e) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,7 @@ ath5k_prepare_multicast(struct ieee80211_hw *hw,
		struct netdev_hw_addr *ha;

		mfilt[0] = 0;
		mfilt[1] = 1;
		mfilt[1] = 0;

		netdev_hw_addr_list_for_each(ha, mc_list) {
		/* calculate XOR of eight 6-bit values */

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -610,7 +610,15 @@ static void ar5008_hw_override_ini(struct ath_hw *ah,
		REG_SET_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS \| AR_DIAG_RX_ABORT));

		if (AR_SREV_9280_20_OR_LATER(ah)) {
		val = REG_READ(ah, AR_PCU_MISC_MODE2);
		/*
		* For AR9280 and above, there is a new feature that allows
		* Multicast search based on both MAC Address and Key ID.
		* By default, this feature is enabled. But since the driver
		* is not using this feature, we switch it off; otherwise
		* multicast search based on MAC addr only will fail.
		*/
		val = REG_READ(ah, AR_PCU_MISC_MODE2) &
		(~AR_ADHOC_MCAST_KEYID_ENABLE);

		if (!AR_SREV_9271(ah))
		val &= ~AR_PCU_MISC_MODE2_HWWAR1;

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -1082,7 +1082,7 @@ static void ath9k_hif_usb_firmware_fail(struct hif_device_usb *hif_dev)
		struct device *dev = &hif_dev->udev->dev;
		struct device *parent = dev->parent;

		complete(&hif_dev->fw_done);
		complete_all(&hif_dev->fw_done);

		if (parent)
		device_lock(parent);
		@@ -1131,7 +1131,7 @@ static void ath9k_hif_usb_firmware_cb(const struct firmware fw, void context)

		release_firmware(fw);
		hif_dev->flags \|= HIF_USB_READY;
		complete(&hif_dev->fw_done);
		complete_all(&hif_dev->fw_done);

		return;

		@@ -1295,7 +1295,9 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)

		usb_set_intfdata(interface, NULL);

		if (!unplugged && (hif_dev->flags & HIF_USB_START))
		/* If firmware was loaded we should drop it
		* go back to first stage bootloader. */
		if (!unplugged && (hif_dev->flags & HIF_USB_READY))
		ath9k_hif_usb_reboot(udev);

		kfree(hif_dev);
		@@ -1316,6 +1318,9 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface,
		if (!(hif_dev->flags & HIF_USB_START))
		ath9k_htc_suspend(hif_dev->htc_handle);

		wait_for_completion(&hif_dev->fw_done);

		if (hif_dev->flags & HIF_USB_READY)
		ath9k_hif_usb_dealloc_urbs(hif_dev);

		return 0;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -861,6 +861,7 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv,
		if (error != 0)
		goto err_rx;

		ath9k_hw_disable(priv->ah);
		#ifdef CONFIG_MAC80211_LEDS
		/* must be initialized before ieee80211_register_hw */
		priv->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(priv->hw,

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

+28 −16

Original line number	Diff line number	Diff line
		@@ -146,6 +146,28 @@ static void ath_set_rates(struct ieee80211_vif vif, struct ieee80211_sta sta,
		ARRAY_SIZE(bf->rates));
		}

		static void ath_txq_skb_done(struct ath_softc sc, struct ath_txq txq,
		struct sk_buff *skb)
		{
		int q;

		q = skb_get_queue_mapping(skb);
		if (txq == sc->tx.uapsdq)
		txq = sc->tx.txq_map[q];

		if (txq != sc->tx.txq_map[q])
		return;

		if (WARN_ON(--txq->pending_frames < 0))
		txq->pending_frames = 0;

		if (txq->stopped &&
		txq->pending_frames < sc->tx.txq_max_pending[q]) {
		ieee80211_wake_queue(sc->hw, q);
		txq->stopped = false;
		}
		}

		static void ath_tx_flush_tid(struct ath_softc sc, struct ath_atx_tid tid)
		{
		struct ath_txq *txq = tid->ac->txq;
		@@ -167,6 +189,7 @@ static void ath_tx_flush_tid(struct ath_softc sc, struct ath_atx_tid tid)
		if (!bf) {
		bf = ath_tx_setup_buffer(sc, txq, tid, skb);
		if (!bf) {
		ath_txq_skb_done(sc, txq, skb);
		ieee80211_free_txskb(sc->hw, skb);
		continue;
		}
		@@ -811,6 +834,7 @@ ath_tx_get_tid_subframe(struct ath_softc sc, struct ath_txq txq,

		if (!bf) {
		__skb_unlink(skb, &tid->buf_q);
		ath_txq_skb_done(sc, txq, skb);
		ieee80211_free_txskb(sc->hw, skb);
		continue;
		}
		@@ -1852,6 +1876,7 @@ static void ath_tx_send_ampdu(struct ath_softc sc, struct ath_txq txq,

		bf = ath_tx_setup_buffer(sc, txq, tid, skb);
		if (!bf) {
		ath_txq_skb_done(sc, txq, skb);
		ieee80211_free_txskb(sc->hw, skb);
		return;
		}
		@@ -2118,6 +2143,7 @@ int ath_tx_start(struct ieee80211_hw hw, struct sk_buff skb,

		bf = ath_tx_setup_buffer(sc, txq, tid, skb);
		if (!bf) {
		ath_txq_skb_done(sc, txq, skb);
		if (txctl->paprd)
		dev_kfree_skb_any(skb);
		else
		@@ -2217,7 +2243,7 @@ static void ath_tx_complete(struct ath_softc sc, struct sk_buff skb,
		struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
		struct ath_common *common = ath9k_hw_common(sc->sc_ah);
		struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
		int q, padpos, padsize;
		int padpos, padsize;
		unsigned long flags;

		ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
		@@ -2253,21 +2279,7 @@ static void ath_tx_complete(struct ath_softc sc, struct sk_buff skb,
		spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

		__skb_queue_tail(&txq->complete_q, skb);

		q = skb_get_queue_mapping(skb);
		if (txq == sc->tx.uapsdq)
		txq = sc->tx.txq_map[q];

		if (txq == sc->tx.txq_map[q]) {
		if (WARN_ON(--txq->pending_frames < 0))
		txq->pending_frames = 0;

		if (txq->stopped &&
		txq->pending_frames < sc->tx.txq_max_pending[q]) {
		ieee80211_wake_queue(sc->hw, q);
		txq->stopped = false;
		}
		}
		ath_txq_skb_done(sc, txq, skb);
		}

		static void ath_tx_complete_buf(struct ath_softc sc, struct ath_buf bf,