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

Commit d80bcf46 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

parents 12440928 a06d8aba

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

+14 −9
Original line number Diff line number Diff line
@@ -1735,6 +1735,8 @@ ath5k_beacon_setup(struct ath5k_hw *ah, struct ath5k_buf *bf) 


	if (dma_mapping_error(ah->dev, bf->skbaddr)) {

		ATH5K_ERR(ah, "beacon DMA mapping failed\n");

		dev_kfree_skb_any(skb);

		bf->skb = NULL;

		return -EIO;

	}
@@ -1819,8 +1821,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	ath5k_txbuf_free_skb(ah, avf->bbuf);

	avf->bbuf->skb = skb;

	ret = ath5k_beacon_setup(ah, avf->bbuf);

	if (ret)

		avf->bbuf->skb = NULL;

out:

	return ret;

}
@@ -1840,6 +1840,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) 
	struct ath5k_vif *avf;

	struct ath5k_buf *bf;

	struct sk_buff *skb;

	int err;



	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_BEACON, "in beacon_send\n");
@@ -1888,11 +1889,6 @@ ath5k_beacon_send(struct ath5k_hw *ah) 


	avf = (void *)vif->drv_priv;

	bf = avf->bbuf;

	if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION ||

		     ah->opmode == NL80211_IFTYPE_MONITOR)) {

		ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf ? bf->skb : NULL);

		return;

	}



	/*

	 * Stop any current dma and put the new frame on the queue.
@@ -1906,8 +1902,17 @@ ath5k_beacon_send(struct ath5k_hw *ah) 


	/* refresh the beacon for AP or MESH mode */

	if (ah->opmode == NL80211_IFTYPE_AP ||

	    ah->opmode == NL80211_IFTYPE_MESH_POINT)

		ath5k_beacon_update(ah->hw, vif);

	    ah->opmode == NL80211_IFTYPE_MESH_POINT) {

		err = ath5k_beacon_update(ah->hw, vif);

		if (err)

			return;

	}



	if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION ||

		     ah->opmode == NL80211_IFTYPE_MONITOR)) {

		ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf->skb);

		return;

	}



	trace_ath5k_tx(ah, bf->skb, &ah->txqs[ah->bhalq]);

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

+4 −4
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static const struct ar9300_eeprom ar9300_default = { 
		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },



		 { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },

		 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
@@ -884,7 +884,7 @@ static const struct ar9300_eeprom ar9300_x113 = { 
		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },



		 { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },

		 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
@@ -2040,7 +2040,7 @@ static const struct ar9300_eeprom ar9300_x112 = { 
		{ { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		{ { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },



		{ { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },

		{ { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },

		{ { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },

		{ { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
@@ -3734,7 +3734,7 @@ static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah) 
				}

			} else {

				reg_pmu_set = (5 << 1) | (7 << 4) |

					      (1 << 8) | (2 << 14) |

					      (2 << 8) | (2 << 14) |

					      (6 << 17) | (1 << 20) |

					      (3 << 24) | (1 << 28);

			}

drivers/net/wireless/ath/ath9k/ar9003_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ 
#define AR_PHY_TPC_11_B1         (AR_SM1_BASE + 0x220)

#define AR_PHY_PDADC_TAB_1       (AR_SM1_BASE + 0x240)

#define AR_PHY_TX_IQCAL_STATUS_B1   (AR_SM1_BASE + 0x48c)

#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM_BASE + 0x450 + ((_i) << 2))

#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM1_BASE + 0x450 + ((_i) << 2))



/*

 * Channel 2 Register Map

drivers/net/wireless/b43/dma.c

+17 −3
Original line number Diff line number Diff line
@@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43_wldev *dev) 
	u32 tmp;

	u16 mmio_base;



	tmp = b43_read32(dev, SSB_TMSHIGH);

	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST);

		if (tmp & BCMA_IOST_DMA64)

			return DMA_BIT_MASK(64);

		break;

#endif

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

		tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);

		if (tmp & SSB_TMSHIGH_DMA64)

			return DMA_BIT_MASK(64);

		break;

#endif

	}



	mmio_base = b43_dmacontroller_base(0, 0);

	b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK);

	tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);

drivers/net/wireless/rt2x00/rt2800usb.c

+2 −0
Original line number Diff line number Diff line
@@ -921,6 +921,8 @@ static struct usb_device_id rt2800usb_device_table[] = { 
	{ USB_DEVICE(0x07d1, 0x3c16) },

	/* Draytek */

	{ USB_DEVICE(0x07fa, 0x7712) },

	/* DVICO */

	{ USB_DEVICE(0x0fe9, 0xb307) },

	/* Edimax */

	{ USB_DEVICE(0x7392, 0x7711) },

	{ USB_DEVICE(0x7392, 0x7717) },