qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-01 13:19:29 +03:00
Code

ath5k: add a spur mitigation fix

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33572 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-09-27 11:12:13 +00:00
parent c4723d07e6
commit f8f2f71426
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
package/mac80211/patches/300-pending_work.patch
View File

@ -180,7 +180,7 @@
static void ieee80211_iface_work(struct work_struct *work) static void ieee80211_iface_work(struct work_struct *work)
{ {
struct ieee80211_sub_if_data *sdata = 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; break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb); ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break; break;
@ -281,13 +281,6 @@
+ list_for_each_entry_rcu(sdata, &local->interfaces, list) { + list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+ if (!sdata->dev) + if (!sdata->dev)
+ continue; + continue;
+
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
+ }
- p2p_sdata = rcu_dereference(local->p2p_sdata); - p2p_sdata = rcu_dereference(local->p2p_sdata);
- if (p2p_sdata) { - if (p2p_sdata) {
@ -296,11 +289,18 @@
- skb->len, acked, GFP_ATOMIC); - skb->len, acked, GFP_ATOMIC);
- } - }
- rcu_read_unlock(); - rcu_read_unlock();
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
}
+
+ if (!skb->dev) { + if (!skb->dev) {
+ sdata = rcu_dereference(local->p2p_sdata); + sdata = rcu_dereference(local->p2p_sdata);
+ if (sdata) + if (sdata)
+ found = true; + found = true;
} + }
+ +
+ if (!found) + if (!found)
+ skb->dev = NULL; + skb->dev = NULL;
@ -406,3 +406,19 @@
ret = sta_info_hash_del(local, sta); ret = sta_info_hash_del(local, sta);
if (ret) if (ret)
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1977,11 +1977,13 @@ ath5k_hw_set_spur_mitigation_filter(stru
spur_delta_phase = (spur_offset << 18) / 25;
spur_freq_sigma_delta = (spur_delta_phase >> 10);
symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 2;
+ break;
case AR5K_BWMODE_5MHZ:
/* Both sample_freq and chip_freq are 10MHz (?) */
spur_delta_phase = (spur_offset << 19) / 25;
spur_freq_sigma_delta = (spur_delta_phase >> 10);
symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 4;
+ break;
default:
if (channel->band == IEEE80211_BAND_5GHZ) {
/* Both sample_freq and chip_freq are 40MHz */