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

+14 -9

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

··· 1735 1735 1736 1736 if (dma_mapping_error(ah->dev, bf->skbaddr)) { 1737 1737 ATH5K_ERR(ah, "beacon DMA mapping failed\n"); 1738 + dev_kfree_skb_any(skb); 1739 + bf->skb = NULL; 1738 1740 return -EIO; 1739 1741 } 1740 1742 ··· 1821 1819 ath5k_txbuf_free_skb(ah, avf->bbuf); 1822 1820 avf->bbuf->skb = skb; 1823 1821 ret = ath5k_beacon_setup(ah, avf->bbuf); 1824 - if (ret) 1825 - avf->bbuf->skb = NULL; 1826 1822 out: 1827 1823 return ret; 1828 1824 } ··· 1840 1840 struct ath5k_vif *avf; 1841 1841 struct ath5k_buf *bf; 1842 1842 struct sk_buff *skb; 1843 + int err; 1843 1844 1844 1845 ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_BEACON, "in beacon_send\n"); 1845 1846 ··· 1889 1888 1890 1889 avf = (void *)vif->drv_priv; 1891 1890 bf = avf->bbuf; 1892 - if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION || 1893 - ah->opmode == NL80211_IFTYPE_MONITOR)) { 1894 - ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf ? bf->skb : NULL); 1895 - return; 1896 - } 1897 1891 1898 1892 /* 1899 1893 * Stop any current dma and put the new frame on the queue. ··· 1902 1906 1903 1907 /* refresh the beacon for AP or MESH mode */ 1904 1908 if (ah->opmode == NL80211_IFTYPE_AP || 1905 - ah->opmode == NL80211_IFTYPE_MESH_POINT) 1906 - ath5k_beacon_update(ah->hw, vif); 1909 + ah->opmode == NL80211_IFTYPE_MESH_POINT) { 1910 + err = ath5k_beacon_update(ah->hw, vif); 1911 + if (err) 1912 + return; 1913 + } 1914 + 1915 + if (unlikely(bf->skb == NULL || ah->opmode == NL80211_IFTYPE_STATION || 1916 + ah->opmode == NL80211_IFTYPE_MONITOR)) { 1917 + ATH5K_WARN(ah, "bf=%p bf_skb=%p\n", bf, bf->skb); 1918 + return; 1919 + } 1907 1920 1908 1921 trace_ath5k_tx(ah, bf->skb, &ah->txqs[ah->bhalq]); 1909 1922

+4 -4

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

··· 307 307 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 308 308 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } }, 309 309 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) } }, 311 311 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 312 312 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 313 313 ··· 884 884 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 885 885 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } }, 886 886 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) } }, 888 888 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 889 889 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 890 890 ··· 2040 2040 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 2041 2041 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } }, 2042 2042 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) } }, 2044 2044 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 2045 2045 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } }, 2046 2046 ··· 3734 3734 } 3735 3735 } else { 3736 3736 reg_pmu_set = (5 << 1) | (7 << 4) | 3737 - (1 << 8) | (2 << 14) | 3737 + (2 << 8) | (2 << 14) | 3738 3738 (6 << 17) | (1 << 20) | 3739 3739 (3 << 24) | (1 << 28); 3740 3740 }

+1 -1

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

··· 850 850 #define AR_PHY_TPC_11_B1 (AR_SM1_BASE + 0x220) 851 851 #define AR_PHY_PDADC_TAB_1 (AR_SM1_BASE + 0x240) 852 852 #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)) 854 854 855 855 /* 856 856 * Channel 2 Register Map

+17 -3

drivers/net/wireless/b43/dma.c

··· 795 795 u32 tmp; 796 796 u16 mmio_base; 797 797 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 + 801 815 mmio_base = b43_dmacontroller_base(0, 0); 802 816 b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); 803 817 tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);

+2

drivers/net/wireless/rt2x00/rt2800usb.c

··· 921 921 { USB_DEVICE(0x07d1, 0x3c16) }, 922 922 /* Draytek */ 923 923 { USB_DEVICE(0x07fa, 0x7712) }, 924 + /* DVICO */ 925 + { USB_DEVICE(0x0fe9, 0xb307) }, 924 926 /* Edimax */ 925 927 { USB_DEVICE(0x7392, 0x7711) }, 926 928 { USB_DEVICE(0x7392, 0x7717) },

+1

drivers/net/wireless/rt2x00/rt73usb.c

··· 2420 2420 /* Buffalo */ 2421 2421 { USB_DEVICE(0x0411, 0x00d8) }, 2422 2422 { USB_DEVICE(0x0411, 0x00d9) }, 2423 + { USB_DEVICE(0x0411, 0x00e6) }, 2423 2424 { USB_DEVICE(0x0411, 0x00f4) }, 2424 2425 { USB_DEVICE(0x0411, 0x0116) }, 2425 2426 { USB_DEVICE(0x0411, 0x0119) },

+8 -3

drivers/net/wireless/rtlwifi/rtl8192cu/sw.c

··· 281 281 {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817d, rtl92cu_hal_cfg)}, 282 282 /* 8188CE-VAU USB minCard (b/g mode only) */ 283 283 {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)}, 284 286 /* 8188 Combo for BC4 */ 285 287 {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)}, 286 288 ··· 305 303 {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/ 306 304 /* HP - Lite-On ,8188CUS Slim Combo */ 307 305 {RTL_USB_DEVICE(0x103c, 0x1629, rtl92cu_hal_cfg)}, 306 + {RTL_USB_DEVICE(0x13d3, 0x3357, rtl92cu_hal_cfg)}, /* AzureWave */ 308 307 {RTL_USB_DEVICE(0x2001, 0x3308, rtl92cu_hal_cfg)}, /*D-Link - Alpha*/ 309 308 {RTL_USB_DEVICE(0x2019, 0xab2a, rtl92cu_hal_cfg)}, /*Planex - Abocom*/ 310 309 {RTL_USB_DEVICE(0x2019, 0xed17, rtl92cu_hal_cfg)}, /*PCI - Edimax*/ 311 310 {RTL_USB_DEVICE(0x20f4, 0x648b, rtl92cu_hal_cfg)}, /*TRENDnet - Cameo*/ 312 311 {RTL_USB_DEVICE(0x7392, 0x7811, rtl92cu_hal_cfg)}, /*Edimax - Edimax*/ 313 - {RTL_USB_DEVICE(0x3358, 0x13d3, rtl92cu_hal_cfg)}, /*Azwave 8188CE-VAU*/ 312 + {RTL_USB_DEVICE(0x13d3, 0x3358, rtl92cu_hal_cfg)}, /*Azwave 8188CE-VAU*/ 314 313 /* Russian customer -Azwave (8188CE-VAU b/g mode only) */ 315 - {RTL_USB_DEVICE(0x3359, 0x13d3, rtl92cu_hal_cfg)}, 314 + {RTL_USB_DEVICE(0x13d3, 0x3359, rtl92cu_hal_cfg)}, 315 + {RTL_USB_DEVICE(0x4855, 0x0090, rtl92cu_hal_cfg)}, /* Feixun */ 316 + {RTL_USB_DEVICE(0x4855, 0x0091, rtl92cu_hal_cfg)}, /* NetweeN-Feixun */ 317 + {RTL_USB_DEVICE(0x9846, 0x9041, rtl92cu_hal_cfg)}, /* Netgear Cameo */ 316 318 317 319 /****** 8192CU ********/ 318 320 {RTL_USB_DEVICE(0x0586, 0x341f, rtl92cu_hal_cfg)}, /*Zyxel -Abocom*/ 319 321 {RTL_USB_DEVICE(0x07aa, 0x0056, rtl92cu_hal_cfg)}, /*ATKK-Gemtek*/ 320 322 {RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Funai -Abocom*/ 321 - {RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Abocom -Abocom*/ 322 323 {RTL_USB_DEVICE(0x2001, 0x3307, rtl92cu_hal_cfg)}, /*D-Link-Cameo*/ 323 324 {RTL_USB_DEVICE(0x2001, 0x3309, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/ 324 325 {RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/

+1 -5

drivers/net/wireless/wl1251/acx.c

··· 140 140 auth->sleep_auth = sleep_auth; 141 141 142 142 ret = wl1251_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth)); 143 - if (ret < 0) 144 - return ret; 145 143 146 144 out: 147 145 kfree(auth); ··· 679 681 680 682 ret = wl1251_cmd_configure(wl, ACX_CCA_THRESHOLD, 681 683 detection, sizeof(*detection)); 682 - if (ret < 0) { 684 + if (ret < 0) 683 685 wl1251_warning("failed to set cca threshold: %d", ret); 684 - return ret; 685 - } 686 686 687 687 out: 688 688 kfree(detection);

+1 -1

drivers/net/wireless/wl1251/cmd.c

··· 241 241 if (ret < 0) { 242 242 wl1251_error("tx %s cmd for channel %d failed", 243 243 enable ? "start" : "stop", channel); 244 - return ret; 244 + goto out; 245 245 } 246 246 247 247 wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",