Changeset 36265
- Timestamp:
- 2013-04-08T00:05:36+02:00 (5 years ago)
- Location:
- trunk/package/mac80211/patches
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/mac80211/patches/300-pending_work.patch
r36134 r36265 159 159 --- a/net/mac80211/iface.c 160 160 +++ b/net/mac80211/iface.c 161 @@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct iee 162 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER); 163 } 164 165 -static u32 ieee80211_idle_off(struct ieee80211_local *local) 166 +u32 ieee80211_idle_off(struct ieee80211_local *local) 167 { 168 if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) 169 return 0; 161 170 @@ -107,7 +107,7 @@ void ieee80211_recalc_idle(struct ieee80 162 171 … … 301 310 { 302 311 struct ieee80211_sub_if_data *sdata = 303 @@ -1126,6 +1175,9 @@ static void ieee80211_iface_work(struct 312 @@ -1126,6 +1175,9 @@ static void ieee80211_iface_work(struct 304 313 break; 305 314 ieee80211_mesh_rx_queued_mgmt(sdata, skb); … … 962 971 963 972 local->num_sta--; 973 --- a/net/mac80211/chan.c 974 +++ b/net/mac80211/chan.c 975 @@ -63,6 +63,7 @@ ieee80211_new_chanctx(struct ieee80211_l 976 enum ieee80211_chanctx_mode mode) 977 { 978 struct ieee80211_chanctx *ctx; 979 + u32 changed; 980 int err; 981 982 lockdep_assert_held(&local->chanctx_mtx); 983 @@ -76,6 +77,13 @@ ieee80211_new_chanctx(struct ieee80211_l 984 ctx->conf.rx_chains_dynamic = 1; 985 ctx->mode = mode; 986 987 + /* acquire mutex to prevent idle from changing */ 988 + mutex_lock(&local->mtx); 989 + /* turn idle off *before* setting channel -- some drivers need that */ 990 + changed = ieee80211_idle_off(local); 991 + if (changed) 992 + ieee80211_hw_config(local, changed); 993 + 994 if (!local->use_chanctx) { 995 local->_oper_channel_type = 996 cfg80211_get_chandef_type(chandef); 997 @@ -85,14 +93,17 @@ ieee80211_new_chanctx(struct ieee80211_l 998 err = drv_add_chanctx(local, ctx); 999 if (err) { 1000 kfree(ctx); 1001 - return ERR_PTR(err); 1002 + ctx = ERR_PTR(err); 1003 + 1004 + ieee80211_recalc_idle(local); 1005 + goto out; 1006 } 1007 } 1008 1009 + /* and keep the mutex held until the new chanctx is on the list */ 1010 list_add_rcu(&ctx->list, &local->chanctx_list); 1011 1012 - mutex_lock(&local->mtx); 1013 - ieee80211_recalc_idle(local); 1014 + out: 1015 mutex_unlock(&local->mtx); 1016 1017 return ctx; 1018 --- a/net/mac80211/ieee80211_i.h 1019 +++ b/net/mac80211/ieee80211_i.h 1020 @@ -1366,6 +1366,7 @@ int ieee80211_if_change_type(struct ieee 1021 enum nl80211_iftype type); 1022 void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata); 1023 void ieee80211_remove_interfaces(struct ieee80211_local *local); 1024 +u32 ieee80211_idle_off(struct ieee80211_local *local); 1025 void ieee80211_recalc_idle(struct ieee80211_local *local); 1026 void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata, 1027 const int offset); -
trunk/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
r36007 r36265 9 9 10 10 #include "hw.h" 11 @@ -519,8 +520,16 @@ static int ath9k_hw_init_macaddr(struct 11 @@ -519,8 +520,16 @@ static int ath9k_hw_init_macaddr(struct 12 12 common->macaddr[2 * i] = eeval >> 8; 13 13 common->macaddr[2 * i + 1] = eeval & 0xff; -
trunk/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
r36007 r36265 1 1 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c 2 2 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c 3 @@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw 3 @@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw 4 4 goto end; 5 5 } -
trunk/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
r36007 r36265 18 18 static bool 19 19 ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data) 20 @@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common 20 @@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common 21 21 struct ath5k_hw *ah = (struct ath5k_hw *) common->ah; 22 22 u32 status, timeout; -
trunk/package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
r36007 r36265 102 102 /* debugfs: queues etc */ 103 103 104 @@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw 104 @@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw 105 105 debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah, 106 106 &fops_beacon); -
trunk/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
r36007 r36265 176 176 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c 177 177 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c 178 @@ -475,12 +475,12 @@ int ath9k_hw_process_rxdesc_edma(struct 178 @@ -475,12 +475,12 @@ int ath9k_hw_process_rxdesc_edma(struct 179 179 180 180 /* XXX: Keycache */ … … 237 237 --- a/drivers/net/wireless/ath/ath9k/debug.c 238 238 +++ b/drivers/net/wireless/ath/ath9k/debug.c 239 @@ -940,12 +940,12 @@ void ath_debug_stat_rx(struct ath_softc 239 @@ -940,12 +940,12 @@ void ath_debug_stat_rx(struct ath_softc 240 240 #ifdef CONFIG_ATH9K_MAC_DEBUG 241 241 spin_lock(&sc->debug.samp_lock); … … 278 278 --- a/net/wireless/nl80211.c 279 279 +++ b/net/wireless/nl80211.c 280 @@ -3082,6 +3082,32 @@ static bool nl80211_put_sta_rate(struct 280 @@ -3082,6 +3082,32 @@ static bool nl80211_put_sta_rate(struct 281 281 return true; 282 282 } … … 373 373 --- a/drivers/net/wireless/ath/ath9k/antenna.c 374 374 +++ b/drivers/net/wireless/ath/ath9k/antenna.c 375 @@ -546,14 +546,14 @@ void ath_ant_comb_scan(struct ath_softc 375 @@ -546,14 +546,14 @@ void ath_ant_comb_scan(struct ath_softc 376 376 struct ath_ant_comb *antcomb = &sc->ant_comb; 377 377 int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set; -
trunk/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch
r36007 r36265 48 48 49 49 /* policy for the key attributes */ 50 @@ -1705,6 +1706,22 @@ static int nl80211_set_wiphy(struct sk_b 51 if (result) 50 @@ -1706,6 +1707,22 @@ static int nl80211_set_wiphy(struct sk_b 52 51 goto bad_res; 53 52 } 54 + 53 55 54 + if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { 56 55 + int idx, dbi = 0; … … 68 67 + goto bad_res; 69 68 + } 70 69 + 71 70 if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && 72 71 info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { 72 u32 tx_ant, rx_ant; 73 73 --- a/net/mac80211/cfg.c 74 74 +++ b/net/mac80211/cfg.c … … 93 93 const u8 *addr) 94 94 { 95 @@ -3375,6 +3388,7 @@ struct cfg80211_ops mac80211_config_ops 95 @@ -3375,6 +3388,7 @@ struct cfg80211_ops mac80211_config_ops 96 96 .set_wiphy_params = ieee80211_set_wiphy_params, 97 97 .set_tx_power = ieee80211_set_tx_power, -
trunk/package/mac80211/patches/530-ath9k_extra_leds.patch
r36007 r36265 163 163 --- a/drivers/net/wireless/ath/ath9k/init.c 164 164 +++ b/drivers/net/wireless/ath/ath9k/init.c 165 @@ -870,7 +870,7 @@ int ath9k_init_device(u16 devid, struct 165 @@ -870,7 +870,7 @@ int ath9k_init_device(u16 devid, struct 166 166 167 167 #ifdef CONFIG_MAC80211_LEDS -
trunk/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch
r36007 r36265 1 1 --- a/drivers/net/wireless/ath/ath9k/mac.c 2 2 +++ b/drivers/net/wireless/ath/ath9k/mac.c 3 @@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 3 @@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 4 4 { 5 5 #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ … … 10 10 11 11 /* Enable access to the DMA observation bus */ 12 @@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 12 @@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 13 13 } 14 14 -
trunk/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
r36007 r36265 187 187 --- a/drivers/net/wireless/rt2x00/rt2800pci.c 188 188 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c 189 @@ -89,25 +89,11 @@ static void rt2800pci_mcu_status(struct 189 @@ -89,25 +89,11 @@ static void rt2800pci_mcu_status(struct 190 190 rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 191 191 } -
trunk/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
r36007 r36265 1 1 --- a/drivers/net/wireless/rt2x00/rt2800pci.c 2 2 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c 3 @@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct 3 @@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct 4 4 rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 5 5 } … … 10 10 memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); 11 11 return 0; 12 @@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct 12 @@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct 13 13 { 14 14 int retval; -
trunk/package/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
r36178 r36265 12 12 1 file changed, 7 insertions(+) 13 13 14 diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c15 index ded73da..e5deb9e 10064416 14 --- a/drivers/net/wireless/rt2x00/rt2800pci.c 17 15 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c 18 @@ -118 3,11 +1183,18 @@ static int rt2800soc_probe(struct platform_device *pdev)16 @@ -1185,11 +1185,18 @@ static int rt2800soc_probe(struct platfo 19 17 return rt2x00soc_probe(pdev, &rt2800pci_ops); 20 18 } … … 35 33 .probe = rt2800soc_probe, 36 34 .remove = rt2x00soc_remove, 37 --38 1.7.10.439 -
trunk/package/mac80211/patches/613-rt2x00-fixup-symbols.patch
r36178 r36265 1 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800pci.c 2 =================================================================== 3 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800pci.c 2013-03-31 19:25:51.185815171 +0200 4 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800pci.c 2013-03-31 19:27:59.805818237 +0200 5 @@ -1179,7 +1179,7 @@ 1 --- a/drivers/net/wireless/rt2x00/rt2800pci.c 2 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c 3 @@ -1179,7 +1179,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_devic 6 4 #endif /* CONFIG_PCI */ 7 5 MODULE_LICENSE("GPL"); … … 12 10 { 13 11 return rt2x00soc_probe(pdev, &rt2800pci_ops); 14 @@ -1203,7 +1203,7 @@ 12 @@ -1203,7 +1203,7 @@ static struct platform_driver rt2800soc_ 15 13 .suspend = rt2x00soc_suspend, 16 14 .resume = rt2x00soc_resume, … … 21 19 #ifdef CONFIG_PCI 22 20 static int rt2800pci_probe(struct pci_dev *pci_dev, 23 @@ -1226,7 +1226,7 @@ 21 @@ -1226,7 +1226,7 @@ static int __init rt2800pci_init(void) 24 22 { 25 23 int ret = 0; … … 30 28 if (ret) 31 29 return ret; 32 @@ -1234,7 +1234,7 @@ 30 @@ -1234,7 +1234,7 @@ static int __init rt2800pci_init(void) 33 31 #ifdef CONFIG_PCI 34 32 ret = pci_register_driver(&rt2800pci_driver); … … 39 37 #endif 40 38 return ret; 41 @@ -1249,7 +1249,7 @@ 39 @@ -1249,7 +1249,7 @@ static void __exit rt2800pci_exit(void) 42 40 #ifdef CONFIG_PCI 43 41 pci_unregister_driver(&rt2800pci_driver); -
trunk/package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
r36178 r36265 1 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800pci.c 2 =================================================================== 3 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800pci.c 2013-03-31 19:27:59.805818237 +0200 4 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800pci.c 2013-03-31 19:40:07.313835573 +0200 5 @@ -322,11 +322,17 @@ 1 --- a/drivers/net/wireless/rt2x00/rt2800pci.c 2 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c 3 @@ -322,11 +322,17 @@ static int rt2800pci_write_firmware(stru 6 4 static char *rt2800pci_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) 7 5 { -
trunk/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
r36178 r36265 1 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c 2 =================================================================== 3 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2013-04-02 10:56:56.245205151 +0200 4 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c 2013-04-02 11:24:06.057243987 +0200 1 --- a/drivers/net/wireless/rt2x00/rt2800lib.c 2 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c 5 3 @@ -38,6 +38,7 @@ 6 4 #include <linux/kernel.h> … … 11 9 #include "rt2x00.h" 12 10 #include "rt2800lib.h" 13 @@ -5 505,13 +5506,14 @@11 @@ -5375,13 +5376,14 @@ static int rt2800_probe_hw_mode(struct r 14 12 15 13 int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev) -
trunk/package/mac80211/patches/616-rt2x00-support-rt5350.patch
r36177 r36265 1 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800.h 2 =================================================================== 3 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800.h 2013-04-01 18:42:38.843812191 +0200 4 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800.h 2013-04-01 18:42:44.483812325 +0200 1 --- a/drivers/net/wireless/rt2x00/rt2800.h 2 +++ b/drivers/net/wireless/rt2x00/rt2800.h 5 3 @@ -69,6 +69,7 @@ 6 4 #define RF3322 0x000c … … 11 9 #define RF5370 0x5370 12 10 #define RF5372 0x5372 13 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c 14 =================================================================== 15 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2013-04-01 18:42:38.843812191 +0200 16 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c 2013-04-01 18:43:27.907813351 +0200 17 @@ -2137,6 +2137,15 @@ 11 --- a/drivers/net/wireless/rt2x00/rt2800lib.c 12 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c 13 @@ -2138,6 +2138,15 @@ static void rt2800_config_channel_rf53xx 18 14 if (rf->channel <= 14) { 19 15 int idx = rf->channel-1; … … 31 27 if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { 32 28 /* r55/r59 value array of channel 1~14 */ 33 @@ -221 8,6 +2227,7 @@29 @@ -2219,6 +2228,7 @@ static void rt2800_config_channel(struct 34 30 case RF3322: 35 31 rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info); … … 39 35 case RF5370: 40 36 case RF5372: 41 @@ -223 1,6 +2241,7 @@37 @@ -2232,6 +2242,7 @@ static void rt2800_config_channel(struct 42 38 43 39 if (rt2x00_rf(rt2x00dev, RF3290) || … … 47 43 rt2x00_rf(rt2x00dev, RF5370) || 48 44 rt2x00_rf(rt2x00dev, RF5372) || 49 @@ -236 1,7 +2372,8 @@45 @@ -2362,7 +2373,8 @@ static void rt2800_config_channel(struct 50 46 /* 51 47 * Clear update flag … … 57 53 rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0); 58 54 rt2800_bbp_write(rt2x00dev, 49, bbp); 59 @@ -280 0,6 +2812,7 @@55 @@ -2801,6 +2813,7 @@ void rt2800_vco_calibration(struct rt2x0 60 56 rt2800_rfcsr_write(rt2x00dev, 7, rfcsr); 61 57 break; … … 65 61 case RF5370: 66 62 case RF5372: 67 @@ -312 4,7 +3137,8 @@63 @@ -3125,7 +3138,8 @@ static int rt2800_init_registers(struct 68 64 } else if (rt2x00_rt(rt2x00dev, RT3572)) { 69 65 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400); … … 75 71 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); 76 72 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); 77 @@ -350 6,6 +3520,10 @@73 @@ -3507,6 +3521,10 @@ static int rt2800_init_bbp(struct rt2x00 78 74 rt2800_bbp_write(rt2x00dev, 4, 0x50); 79 75 } … … 86 82 rt2x00_rt(rt2x00dev, RT5390) || 87 83 rt2x00_rt(rt2x00dev, RT5392)) { 88 @@ -351 8,11 +3536,13 @@84 @@ -3519,11 +3537,13 @@ static int rt2800_init_bbp(struct rt2x00 89 85 rt2x00_rt(rt2x00dev, RT3290) || 90 86 rt2x00_rt(rt2x00dev, RT3352) || … … 101 97 102 98 rt2800_bbp_write(rt2x00dev, 65, 0x2c); 103 @@ -353 0,6 +3550,7 @@99 @@ -3531,6 +3551,7 @@ static int rt2800_init_bbp(struct rt2x00 104 100 105 101 if (rt2x00_rt(rt2x00dev, RT3290) || … … 109 105 rt2x00_rt(rt2x00dev, RT5392)) 110 106 rt2800_bbp_write(rt2x00dev, 68, 0x0b); 111 @@ -35 39,6 +3560,7 @@107 @@ -3540,6 +3561,7 @@ static int rt2800_init_bbp(struct rt2x00 112 108 rt2800_bbp_write(rt2x00dev, 73, 0x12); 113 109 } else if (rt2x00_rt(rt2x00dev, RT3290) || … … 117 113 rt2x00_rt(rt2x00dev, RT5392)) { 118 114 rt2800_bbp_write(rt2x00dev, 69, 0x12); 119 @@ -357 5,7 +3597,8 @@115 @@ -3576,7 +3598,8 @@ static int rt2800_init_bbp(struct rt2x00 120 116 rt2800_bbp_write(rt2x00dev, 79, 0x18); 121 117 rt2800_bbp_write(rt2x00dev, 80, 0x09); … … 127 123 rt2800_bbp_write(rt2x00dev, 80, 0x08); 128 124 rt2800_bbp_write(rt2x00dev, 81, 0x37); 129 @@ -358 5,6 +3608,7 @@125 @@ -3586,6 +3609,7 @@ static int rt2800_init_bbp(struct rt2x00 130 126 131 127 rt2800_bbp_write(rt2x00dev, 82, 0x62); … … 135 131 rt2x00_rt(rt2x00dev, RT5392)) 136 132 rt2800_bbp_write(rt2x00dev, 83, 0x7a); 137 @@ -359 4,6 +3618,7 @@133 @@ -3595,6 +3619,7 @@ static int rt2800_init_bbp(struct rt2x00 138 134 if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D)) 139 135 rt2800_bbp_write(rt2x00dev, 84, 0x19); … … 143 139 rt2x00_rt(rt2x00dev, RT5392)) 144 140 rt2800_bbp_write(rt2x00dev, 84, 0x9a); 145 @@ -360 2,6 +3627,7 @@141 @@ -3603,6 +3628,7 @@ static int rt2800_init_bbp(struct rt2x00 146 142 147 143 if (rt2x00_rt(rt2x00dev, RT3290) || … … 151 147 rt2x00_rt(rt2x00dev, RT5392)) 152 148 rt2800_bbp_write(rt2x00dev, 86, 0x38); 153 @@ -361 6,6 +3642,7 @@149 @@ -3617,6 +3643,7 @@ static int rt2800_init_bbp(struct rt2x00 154 150 155 151 if (rt2x00_rt(rt2x00dev, RT3290) || … … 159 155 rt2x00_rt(rt2x00dev, RT5392)) 160 156 rt2800_bbp_write(rt2x00dev, 92, 0x02); 161 @@ -363 4,6 +3661,7 @@157 @@ -3635,6 +3662,7 @@ static int rt2800_init_bbp(struct rt2x00 162 158 rt2x00_rt(rt2x00dev, RT3290) || 163 159 rt2x00_rt(rt2x00dev, RT3352) || … … 167 163 rt2x00_rt(rt2x00dev, RT5392) || 168 164 rt2800_is_305x_soc(rt2x00dev)) 169 @@ -364 3,6 +3671,7 @@165 @@ -3644,6 +3672,7 @@ static int rt2800_init_bbp(struct rt2x00 170 166 171 167 if (rt2x00_rt(rt2x00dev, RT3290) || … … 175 171 rt2x00_rt(rt2x00dev, RT5392)) 176 172 rt2800_bbp_write(rt2x00dev, 104, 0x92); 177 @@ -365 3,13 +3682,15 @@173 @@ -3654,13 +3683,15 @@ static int rt2800_init_bbp(struct rt2x00 178 174 rt2800_bbp_write(rt2x00dev, 105, 0x1c); 179 175 else if (rt2x00_rt(rt2x00dev, RT3352)) … … 192 188 rt2800_bbp_write(rt2x00dev, 106, 0x03); 193 189 else if (rt2x00_rt(rt2x00dev, RT3352)) 194 @@ -36 69,11 +3700,13 @@190 @@ -3670,11 +3701,13 @@ static int rt2800_init_bbp(struct rt2x00 195 191 else 196 192 rt2800_bbp_write(rt2x00dev, 106, 0x35); … … 207 203 rt2x00_rt(rt2x00dev, RT5392)) 208 204 rt2800_bbp_write(rt2x00dev, 128, 0x12); 209 @@ -368 3,13 +3716,15 @@205 @@ -3684,13 +3717,15 @@ static int rt2800_init_bbp(struct rt2x00 210 206 rt2800_bbp_write(rt2x00dev, 135, 0xf6); 211 207 } … … 224 220 rt2x00_rt(rt2x00dev, RT5392)) { 225 221 rt2800_bbp_read(rt2x00dev, 138, &value); 226 @@ -372 6,7 +3761,8 @@222 @@ -3727,7 +3762,8 @@ static int rt2800_init_bbp(struct rt2x00 227 223 rt2800_bbp_write(rt2x00dev, 3, value); 228 224 } … … 234 230 /* Set ITxBF timeout to 0x9c40=1000msec */ 235 231 rt2800_bbp_write(rt2x00dev, 179, 0x02); 236 @@ -374 8,6 +3784,14 @@232 @@ -3749,6 +3785,14 @@ static int rt2800_init_bbp(struct rt2x00 237 233 rt2800_bbp_write(rt2x00dev, 148, 0xc8); 238 234 } … … 249 245 rt2x00_rt(rt2x00dev, RT5392)) { 250 246 int ant, div_mode; 251 @@ -414 2,6 +4186,76 @@247 @@ -4143,6 +4187,76 @@ static void rt2800_init_rfcsr_3572(struc 252 248 rt2800_rfcsr_write(rt2x00dev, 31, 0x10); 253 249 } … … 326 322 { 327 323 rt2800_rfcsr_write(rt2x00dev, 1, 0x0f); 328 @@ -430 4,6 +4418,7 @@324 @@ -4305,6 +4419,7 @@ static int rt2800_init_rfcsr(struct rt2x 329 325 !rt2x00_rt(rt2x00dev, RT3352) && 330 326 !rt2x00_rt(rt2x00dev, RT3390) && … … 334 330 !rt2x00_rt(rt2x00dev, RT5392) && 335 331 !rt2800_is_305x_soc(rt2x00dev)) 336 @@ -435 4,6 +4469,9 @@332 @@ -4355,6 +4470,9 @@ static int rt2800_init_rfcsr(struct rt2x 337 333 case RT3572: 338 334 rt2800_init_rfcsr_3572(rt2x00dev); … … 344 340 rt2800_init_rfcsr_5390(rt2x00dev); 345 341 break; 346 @@ -475 0,6 +4868,12 @@342 @@ -4751,6 +4869,12 @@ static int rt2800_validate_eeprom(struct 347 343 if (rt2x00_get_field16(word, EEPROM_NIC_CONF0_RXPATH) > 2) 348 344 rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 2); … … 357 353 358 354 rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &word); 359 @@ -487 4,6 +4998,8 @@355 @@ -4875,6 +4999,8 @@ static int rt2800_init_eeprom(struct rt2 360 356 rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 || 361 357 rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392) … … 366 362 value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE); 367 363 368 @@ -489 1,6 +5017,7 @@364 @@ -4892,6 +5018,7 @@ static int rt2800_init_eeprom(struct rt2 369 365 case RT3352: 370 366 case RT3390: … … 374 370 case RT5392: 375 371 break; 376 @@ -491 2,6 +5039,7 @@372 @@ -4913,6 +5040,7 @@ static int rt2800_init_eeprom(struct rt2 377 373 case RF3290: 378 374 case RF3320: … … 382 378 case RF5370: 383 379 case RF5372: 384 @@ -527 4,7 +5402,8 @@380 @@ -5275,7 +5403,8 @@ static int rt2800_probe_hw_mode(struct r 385 381 rt2x00_rf(rt2x00dev, RF5392)) { 386 382 spec->num_channels = 14; … … 392 388 if (spec->clk_is_20mhz) 393 389 spec->channels = rf_vals_xtal20mhz_3x; 394 @@ -536 3,6 +5492,7 @@390 @@ -5364,6 +5493,7 @@ static int rt2800_probe_hw_mode(struct r 395 391 case RF3290: 396 392 case RF5360: … … 400 396 case RF5390: 401 397 case RF5392: 402 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00.h 403 =================================================================== 404 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2x00.h 2013-04-01 18:42:38.843812191 +0200 405 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00.h 2013-04-01 18:42:44.487812326 +0200 406 @@ -192,6 +192,7 @@ 398 --- a/drivers/net/wireless/rt2x00/rt2x00.h 399 +++ b/drivers/net/wireless/rt2x00/rt2x00.h 400 @@ -192,6 +192,7 @@ struct rt2x00_chip { 407 401 #define RT3572 0x3572 408 402 #define RT3593 0x3593 -
trunk/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
r36194 r36265 11 11 2 files changed, 39 insertions(+), 6 deletions(-) 12 12 13 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/Kconfig 14 =================================================================== 15 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/Kconfig 2013-04-04 14:20:02.621776831 +0200 16 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/Kconfig 2013-04-04 14:20:02.977776837 +0200 17 @@ -64,6 +64,7 @@ 13 --- a/drivers/net/wireless/rt2x00/Kconfig 14 +++ b/drivers/net/wireless/rt2x00/Kconfig 15 @@ -64,6 +64,7 @@ config RT2800PCI 18 16 select RT2X00_LIB_CRYPTO 19 17 select CRC_CCITT … … 23 21 This adds support for rt27xx/rt28xx/rt30xx wireless chipset family. 24 22 Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890, RT3052, 25 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00eeprom.c 26 =================================================================== 27 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2x00eeprom.c 2013-04-04 14:20:02.621776831 +0200 28 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00eeprom.c 2013-04-04 15:23:19.601807539 +0200 23 --- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c 24 +++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c 29 25 @@ -30,12 +30,77 @@ 30 26 #include "rt2x00.h" -
trunk/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch
r36134 r36265 50 50 /* 51 51 * Running count of TX packets in flight, to avoid 52 @@ -2401,6 +2402,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, 52 @@ -2401,6 +2402,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, 53 53 { 54 54 struct mwl8k_priv *priv = hw->priv; … … 60 60 mwl8k_setup_2ghz_band(hw); 61 61 if (caps & MWL8K_CAP_MIMO) 62 @@ -2412,6 +2416,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, 62 @@ -2412,6 +2416,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, 63 63 if (caps & MWL8K_CAP_MIMO) 64 64 mwl8k_set_ht_caps(hw, &priv->band_50, caps); -
trunk/package/mac80211/patches/850-brcmsmac-start-adding-support-for-core-rev-28.patch
r36007 r36265 11 11 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 12 12 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 13 @@ -717,7 +717,7 @@ static void brcms_c_ucode_bsinit(struct 13 @@ -717,7 +717,7 @@ static void brcms_c_ucode_bsinit(struct 14 14 brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); 15 15 … … 20 20 brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); 21 21 else 22 @@ -2257,7 +2257,7 @@ static void brcms_ucode_download(struct 22 @@ -2257,7 +2257,7 @@ static void brcms_ucode_download(struct 23 23 if (wlc_hw->ucode_loaded) 24 24 return; -
trunk/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
r36113 r36265 37 37 * Permission to use, copy, modify, and/or distribute this software for any 38 38 * purpose with or without fee is hereby granted, provided that the above 39 @@ -450,6 +451,8 @@ static void brcms_c_detach_mfree(struct 39 @@ -450,6 +451,8 @@ static void brcms_c_detach_mfree(struct 40 40 kfree(wlc->corestate); 41 41 kfree(wlc->hw->bandstate[0]); -
trunk/package/mac80211/patches/871-brcmsmac-add-support-for-probe-response-template.patch
r36113 r36265 28 28 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 29 29 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 30 @@ -453,6 +453,8 @@ static void brcms_c_detach_mfree(struct 30 @@ -453,6 +453,8 @@ static void brcms_c_detach_mfree(struct 31 31 kfree(wlc->hw); 32 32 if (wlc->beacon)
Note: See TracChangeset
for help on using the changeset viewer.