hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: refresh patches

Browse Source 
SVN-Revision: 33557
master
Florian Fainelli 12 years ago
parent c27c0d1ff0
commit 60eec72adb
14 changed files with 30 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package/mac80211/patches/130-mesh_pathtbl_backport.patch
  2. 18
      package/mac80211/patches/300-pending_work.patch
  3. 2
      package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
  4. 2
      package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
  5. 2
      package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
  6. 2
      package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
  7. 6
      package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
  8. 2
      package/mac80211/patches/540-ath9k_extra_leds.patch
  9. 4
      package/mac80211/patches/563-ath9k_rx_dma_stop_check.patch
  10. 8
      package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
  11. 2
      package/mac80211/patches/605-rt2x00-pci-eeprom.patch
  12. 2
      package/mac80211/patches/620-rt2x00-support-rt3352.patch
  13. 4
      package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch
  14. 4
      package/mac80211/patches/851-brcmsmac-start-adding-support-for-core-rev-28.patch

2
package/mac80211/patches/130-mesh_pathtbl_backport.patch
Unescape View File

@ -1,6 +1,6 @@
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct
@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct
struct hlist_node *p;
int i;

18
package/mac80211/patches/300-pending_work.patch
Unescape View File

@ -180,7 +180,7 @@
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
@@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct
@@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
@ -281,6 +281,13 @@
+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+ if (!sdata->dev)
+ continue;
+
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
+ }
- p2p_sdata = rcu_dereference(local->p2p_sdata);
- if (p2p_sdata) {
@ -289,18 +296,11 @@
- skb->len, acked, GFP_ATOMIC);
- }
- rcu_read_unlock();
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
}
+
+ if (!skb->dev) {
+ sdata = rcu_dereference(local->p2p_sdata);
+ if (sdata)
+ found = true;
+ }
}
+
+ if (!found)
+ skb->dev = NULL;

2
package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
Unescape View File

@ -8,7 +8,7 @@
#include <asm/unaligned.h>
#include "hw.h"
@@ -523,8 +524,16 @@ static int ath9k_hw_init_macaddr(struct
@@ -523,8 +524,16 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}

2
package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
Unescape View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw
@@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw
goto end;
}

2
package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
Unescape View File

@ -17,7 +17,7 @@
*/
static bool
ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
@@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common
@@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common
struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
u32 status, timeout;

2
package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
Unescape View File

@ -101,7 +101,7 @@ drivers/net/wireless/ath/ath5k/debug.c | 86 ++++++++++++++++++++++++++++++++
/* debugfs: queues etc */
@@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw
@@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw
debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah,
&fops_beacon);

6
package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
Unescape View File

@ -166,7 +166,7 @@
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -458,12 +458,12 @@ int ath9k_hw_process_rxdesc_edma(struct
@@ -458,12 +458,12 @@ int ath9k_hw_process_rxdesc_edma(struct
/* XXX: Keycache */
rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);
@ -227,7 +227,7 @@
if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc
@@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc
#ifdef CONFIG_ATH9K_MAC_DEBUG
spin_lock(&sc->debug.samp_lock);
RX_SAMP_DBG(jiffies) = jiffies;
@ -363,7 +363,7 @@
* hardware stores this as 8 bit signed value.
--- a/drivers/net/wireless/ath/ath9k/antenna.c
+++ b/drivers/net/wireless/ath/ath9k/antenna.c
@@ -529,14 +529,14 @@ void ath_ant_comb_scan(struct ath_softc
@@ -529,14 +529,14 @@ void ath_ant_comb_scan(struct ath_softc
struct ath_ant_comb *antcomb = &sc->ant_comb;
int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
int curr_main_set;

2
package/mac80211/patches/540-ath9k_extra_leds.patch
Unescape View File

@ -171,7 +171,7 @@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct
@@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CONFIG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */

4
package/mac80211/patches/563-ath9k_rx_dma_stop_check.patch
Unescape View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
{
#define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
struct ath_common *common = ath9k_hw_common(ah);
@ -9,7 +9,7 @@
int i;
/* Enable access to the DMA observation bus */
@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
}
if (i == 0) {

8
package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
Unescape View File

@ -186,7 +186,7 @@
obj-$(CONFIG_RT2X00_LIB_PCI) += rt2x00pci.o
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct
@@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}
@ -198,12 +198,12 @@
- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
-
- iounmap(base_addr);
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
}
-}
-#else
-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
-{
-}
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
}
-#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
#ifdef CONFIG_PCI

2
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
Unescape View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}

2
package/mac80211/patches/620-rt2x00-support-rt3352.patch
Unescape View File

@ -127,7 +127,7 @@
}
static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev)
@@ -2961,11 +3038,15 @@ static int rt2800_init_registers(struct
@@ -2961,11 +3038,15 @@ static int rt2800_init_registers(struct
if (rt2x00_rt(rt2x00dev, RT3071) ||
rt2x00_rt(rt2x00dev, RT3090) ||
rt2x00_rt(rt2x00dev, RT3290) ||

4
package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch
Unescape View File

@ -10,7 +10,7 @@
BCMA_CORETABLE_END
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct
@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct
brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
/* do band-specific ucode IHR, SHM, and SCR inits */
@ -19,7 +19,7 @@
if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
else
@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct
@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct
if (wlc_hw->ucode_loaded)
return;

4
package/mac80211/patches/851-brcmsmac-start-adding-support-for-core-rev-28.patch
Unescape View File

@ -10,7 +10,7 @@
MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct
@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct
brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
/* do band-specific ucode IHR, SHM, and SCR inits */
@ -19,7 +19,7 @@
if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
else
@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct
@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct
if (wlc_hw->ucode_loaded)
return;

Write Preview
Loading…
Cancel
Save