History

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

David S. Miller committed 15 years ago

Commit d80bcf42 parents 1244092 a06d8ab9 files · +49 −26Browse files

Unified · Split

9 files
  1. drivers/net/wireless/ath/ath5k/base.c +14 −9
  2. drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +4 −4
  3. drivers/net/wireless/ath/ath9k/ar9003_phy.h +1 −1
  4. drivers/net/wireless/b43/dma.c +17 −3
  5. drivers/net/wireless/rt2x00/rt2800usb.c +2 −0
  6. drivers/net/wireless/rt2x00/rt73usb.c +1 −0
  7. drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +8 −3
  8. drivers/net/wireless/wl1251/acx.c +1 −5
  9. drivers/net/wireless/wl1251/cmd.c +1 −1
drivers/net/wireless/ath/ath5k/base.c+14−9
@@ -1735,6 +1735,8 @@ ath5k_beacon_setup(struct ath5k_hw *ah, struct ath5k_buf *bf) · 1734 unmodified lines
17351735
17361736 if (dma_mapping_error(ah->dev, bf->skbaddr)) {
17371737 ATH5K_ERR(ah, "beacon DMA mapping failed\n");
1738+ dev_kfree_skb_any(skb);
1739+ bf->skb = NULL;
17381740 return -EIO;
17391741 }
17401742
@@ -1819,8 +1821,6 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) · 78 unmodified lines
18191821 ath5k_txbuf_free_skb(ah, avf->bbuf);
18201822 avf->bbuf->skb = skb;
18211823 ret = ath5k_beacon_setup(ah, avf->bbuf);
1822− if (ret)
1823− avf->bbuf->skb = NULL;
18241824 out:
18251825 return ret;
18261826 }
@@ -1840,6 +1840,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) · 13 unmodified lines
18401840 struct ath5k_vif *avf;
18411841 struct ath5k_buf *bf;
18421842 struct sk_buff *skb;
1843+ int err;
18431844
18441845 ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_BEACON, "in beacon_send\n");
18451846
@@ -1888,11 +1889,6 @@ ath5k_beacon_send(struct ath5k_hw *ah) · 42 unmodified lines
18881889
18891890 avf = (void *)vif->drv_priv;
18901891 bf = avf->bbuf;
1891− if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION ||
1892− ah->opmode == NL80211_IFTYPE_MONITOR)) {
1893− ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf ? bf->skb : NULL);
1894− return;
1895− }
18961892
18971893 /*
18981894 * Stop any current dma and put the new frame on the queue.
@@ -1906,8 +1902,17 @@ ath5k_beacon_send(struct ath5k_hw *ah) · 7 unmodified lines
19061902
19071903 /* refresh the beacon for AP or MESH mode */
19081904 if (ah->opmode == NL80211_IFTYPE_AP ||
1909− ah->opmode == NL80211_IFTYPE_MESH_POINT)
1910− ath5k_beacon_update(ah->hw, vif);
1905+ ah->opmode == NL80211_IFTYPE_MESH_POINT) {
1906+ err = ath5k_beacon_update(ah->hw, vif);
1907+ if (err)
1908+ return;
1909+ }
1910+
1911+ if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION ||
1912+ ah->opmode == NL80211_IFTYPE_MONITOR)) {
1913+ ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf->skb);
1914+ return;
1915+ }
19111916
19121917 trace_ath5k_tx(ah, bf->skb, &ah->txqs[ah->bhalq]);
19131918
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c+4−4
@@ -307,7 +307,7 @@ static const struct ar9300_eeprom ar9300_default = { · 306 unmodified lines
307307 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
308308 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
309309
310− { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
310+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },
311311 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
312312 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
313313
@@ -884,7 +884,7 @@ static const struct ar9300_eeprom ar9300_x113 = { · 570 unmodified lines
884884 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
885885 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
886886
887− { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
887+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },
888888 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
889889 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
890890
@@ -2040,7 +2040,7 @@ static const struct ar9300_eeprom ar9300_x112 = { · 1149 unmodified lines
20402040 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
20412041 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
20422042
2043− { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
2043+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0) } },
20442044 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
20452045 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
20462046
@@ -3734,7 +3734,7 @@ static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah) · 1687 unmodified lines
37343734 }
37353735 } else {
37363736 reg_pmu_set = (5 << 1) | (7 << 4) |
3737− (1 << 8) | (2 << 14) |
3737+ (2 << 8) | (2 << 14) |
37383738 (6 << 17) | (1 << 20) |
37393739 (3 << 24) | (1 << 28);
37403740 }
drivers/net/wireless/ath/ath9k/ar9003_phy.h+1−1
@@ -850,7 +850,7 @@ · 849 unmodified lines
850850 #define AR_PHY_TPC_11_B1 (AR_SM1_BASE + 0x220)
851851 #define AR_PHY_PDADC_TAB_1 (AR_SM1_BASE + 0x240)
852852 #define AR_PHY_TX_IQCAL_STATUS_B1 (AR_SM1_BASE + 0x48c)
853−#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i) (AR_SM_BASE + 0x450 + ((_i) << 2))
853+#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i) (AR_SM1_BASE + 0x450 + ((_i) << 2))
854854
855855 /*
856856 * Channel 2 Register Map
drivers/net/wireless/b43/dma.c+17−3
@@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43_wldev *dev) · 794 unmodified lines
795795 u32 tmp;
796796 u16 mmio_base;
797797
798− tmp = b43_read32(dev, SSB_TMSHIGH);
799− if (tmp & SSB_TMSHIGH_DMA64)
800− return DMA_BIT_MASK(64);
798+ switch (dev->dev->bus_type) {
799+#ifdef CONFIG_B43_BCMA
800+ case B43_BUS_BCMA:
801+ tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST);
802+ if (tmp & BCMA_IOST_DMA64)
803+ return DMA_BIT_MASK(64);
804+ break;
805+#endif
806+#ifdef CONFIG_B43_SSB
807+ case B43_BUS_SSB:
808+ tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
809+ if (tmp & SSB_TMSHIGH_DMA64)
810+ return DMA_BIT_MASK(64);
811+ break;
812+#endif
813+ }
814+
801815 mmio_base = b43_dmacontroller_base(0, 0);
802816 b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK);
803817 tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);
drivers/net/wireless/rt2x00/rt2800usb.c+2−0
@@ -921,6 +921,8 @@ static struct usb_device_id rt2800usb_device_table[] = { · 920 unmodified lines
921921 { USB_DEVICE(0x07d1, 0x3c16) },
922922 /* Draytek */
923923 { USB_DEVICE(0x07fa, 0x7712) },
924+ /* DVICO */
925+ { USB_DEVICE(0x0fe9, 0xb307) },
924926 /* Edimax */
925927 { USB_DEVICE(0x7392, 0x7711) },
926928 { USB_DEVICE(0x7392, 0x7717) },
drivers/net/wireless/rt2x00/rt73usb.c+1−0
@@ -2420,6 +2420,7 @@ static struct usb_device_id rt73usb_device_table[] = { · 2419 unmodified lines
24202420 /* Buffalo */
24212421 { USB_DEVICE(0x0411, 0x00d8) },
24222422 { USB_DEVICE(0x0411, 0x00d9) },
2423+ { USB_DEVICE(0x0411, 0x00e6) },
24232424 { USB_DEVICE(0x0411, 0x00f4) },
24242425 { USB_DEVICE(0x0411, 0x0116) },
24252426 { USB_DEVICE(0x0411, 0x0119) },
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c+8−3
@@ -281,6 +281,8 @@ static struct usb_device_id rtl8192c_usb_ids[] = { · 280 unmodified lines
281281 {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817d, rtl92cu_hal_cfg)},
282282 /* 8188CE-VAU USB minCard (b/g mode only) */
283283 {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817e, rtl92cu_hal_cfg)},
284+ /* 8188RU in Alfa AWUS036NHR */
285+ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
284286 /* 8188 Combo for BC4 */
285287 {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
286288
@@ -303,20 +305,23 @@ static struct usb_device_id rtl8192c_usb_ids[] = { · 16 unmodified lines
303305 {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/
304306 /* HP - Lite-On ,8188CUS Slim Combo */
305307 {RTL_USB_DEVICE(0x103c, 0x1629, rtl92cu_hal_cfg)},
308+ {RTL_USB_DEVICE(0x13d3, 0x3357, rtl92cu_hal_cfg)}, /* AzureWave */
306309 {RTL_USB_DEVICE(0x2001, 0x3308, rtl92cu_hal_cfg)}, /*D-Link - Alpha*/
307310 {RTL_USB_DEVICE(0x2019, 0xab2a, rtl92cu_hal_cfg)}, /*Planex - Abocom*/
308311 {RTL_USB_DEVICE(0x2019, 0xed17, rtl92cu_hal_cfg)}, /*PCI - Edimax*/
309312 {RTL_USB_DEVICE(0x20f4, 0x648b, rtl92cu_hal_cfg)}, /*TRENDnet - Cameo*/
310313 {RTL_USB_DEVICE(0x7392, 0x7811, rtl92cu_hal_cfg)}, /*Edimax - Edimax*/
311− {RTL_USB_DEVICE(0x3358, 0x13d3, rtl92cu_hal_cfg)}, /*Azwave 8188CE-VAU*/
314+ {RTL_USB_DEVICE(0x13d3, 0x3358, rtl92cu_hal_cfg)}, /*Azwave 8188CE-VAU*/
312315 /* Russian customer -Azwave (8188CE-VAU b/g mode only) */
313− {RTL_USB_DEVICE(0x3359, 0x13d3, rtl92cu_hal_cfg)},
316+ {RTL_USB_DEVICE(0x13d3, 0x3359, rtl92cu_hal_cfg)},
317+ {RTL_USB_DEVICE(0x4855, 0x0090, rtl92cu_hal_cfg)}, /* Feixun */
318+ {RTL_USB_DEVICE(0x4855, 0x0091, rtl92cu_hal_cfg)}, /* NetweeN-Feixun */
319+ {RTL_USB_DEVICE(0x9846, 0x9041, rtl92cu_hal_cfg)}, /* Netgear Cameo */
314320
315321 /****** 8192CU ********/
316322 {RTL_USB_DEVICE(0x0586, 0x341f, rtl92cu_hal_cfg)}, /*Zyxel -Abocom*/
317323 {RTL_USB_DEVICE(0x07aa, 0x0056, rtl92cu_hal_cfg)}, /*ATKK-Gemtek*/
318324 {RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Funai -Abocom*/
319− {RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Abocom -Abocom*/
320325 {RTL_USB_DEVICE(0x2001, 0x3307, rtl92cu_hal_cfg)}, /*D-Link-Cameo*/
321326 {RTL_USB_DEVICE(0x2001, 0x3309, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/
322327 {RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/
drivers/net/wireless/wl1251/acx.c+1−5
@@ -140,8 +140,6 @@ int wl1251_acx_sleep_auth(struct wl1251 *wl, u8 sleep_auth) · 139 unmodified lines
140140 auth->sleep_auth = sleep_auth;
141141
142142 ret = wl1251_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth));
143− if (ret < 0)
144− return ret;
145143
146144 out:
147145 kfree(auth);
@@ -681,10 +679,8 @@ int wl1251_acx_cca_threshold(struct wl1251 *wl) · 533 unmodified lines
681679
682680 ret = wl1251_cmd_configure(wl, ACX_CCA_THRESHOLD,
683681 detection, sizeof(*detection));
684− if (ret < 0) {
682+ if (ret < 0)
685683 wl1251_warning("failed to set cca threshold: %d", ret);
686− return ret;
687− }
688684
689685 out:
690686 kfree(detection);
drivers/net/wireless/wl1251/cmd.c+1−1
@@ -241,7 +241,7 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable) · 240 unmodified lines
241241 if (ret < 0) {
242242 wl1251_error("tx %s cmd for channel %d failed",
243243 enable ? "start" : "stop", channel);
244− return ret;
244+ goto out;
245245 }
246246
247247 wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t