projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: sync with trunk (as of r25965)
[openwrt-10.03/.git]
/
package
/
mac80211
/
patches
/
531-ath9k_fix_ap_ps_buffering.patch
diff --git
a/package/mac80211/patches/531-ath9k_fix_ap_ps_buffering.patch
b/package/mac80211/patches/531-ath9k_fix_ap_ps_buffering.patch
index b22bc868ddd0088e50c0b0b4d632fed369c2c932..ff58c26d7ad58a8aaf91c465075cb1432d8bfd43 100644
(file)
--- a/
package/mac80211/patches/531-ath9k_fix_ap_ps_buffering.patch
+++ b/
package/mac80211/patches/531-ath9k_fix_ap_ps_buffering.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -20
5,6 +205
,7 @@ struct ath_atx_ac {
+@@ -20
3,6 +203
,7 @@ struct ath_atx_ac {
int sched;
struct list_head list;
struct list_head tid_q;
int sched;
struct list_head list;
struct list_head tid_q;
@@
-8,7
+8,7
@@
};
struct ath_frame_info {
};
struct ath_frame_info {
-@@ -26
2,6 +263
,8 @@ struct ath_node {
+@@ -26
0,6 +261
,8 @@ struct ath_node {
struct ath_atx_ac ac[WME_NUM_AC];
u16 maxampdu;
u8 mpdudensity;
struct ath_atx_ac ac[WME_NUM_AC];
u16 maxampdu;
u8 mpdudensity;
@@
-17,7
+17,7
@@
};
#define AGGR_CLEANUP BIT(1)
};
#define AGGR_CLEANUP BIT(1)
-@@ -34
3,6 +346
,9 @@ int ath_tx_aggr_start(struct ath_softc *
+@@ -34
1,6 +344
,9 @@ int ath_tx_aggr_start(struct ath_softc *
void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
@@
-57,7
+57,7
@@
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params)
{
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params)
{
-@@ -21
30,6 +2151
,7 @@ struct ieee80211_ops ath9k_ops = {
+@@ -21
91,6 +2212
,7 @@ struct ieee80211_ops ath9k_ops = {
.configure_filter = ath9k_configure_filter,
.sta_add = ath9k_sta_add,
.sta_remove = ath9k_sta_remove,
.configure_filter = ath9k_configure_filter,
.sta_add = ath9k_sta_add,
.sta_remove = ath9k_sta_remove,
@@
-189,7
+189,7
@@
void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
{
struct ath_atx_tid *txtid;
void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
{
struct ath_atx_tid *txtid;
-@@ -149
2,7 +1569
,6 @@ static int setup_tx_flags(struct sk_buff
+@@ -149
3,7 +1570
,6 @@ static int setup_tx_flags(struct sk_buff
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
int flags = 0;
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
int flags = 0;
@@
-197,7
+197,7
@@
flags |= ATH9K_TXDESC_INTREQ;
if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
flags |= ATH9K_TXDESC_INTREQ;
if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
-@@ -175
5,6 +1831
,9 @@ static void ath_tx_start_dma(struct ath_
+@@ -175
6,6 +1832
,9 @@ static void ath_tx_start_dma(struct ath_
if (txctl->paprd)
bf->bf_state.bfs_paprd_timestamp = jiffies;
if (txctl->paprd)
bf->bf_state.bfs_paprd_timestamp = jiffies;