mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: update to 2011-02-25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25749 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -205,6 +205,7 @@ struct ath_atx_ac {
|
||||
@@ -203,6 +203,7 @@ struct ath_atx_ac {
|
||||
int sched;
|
||||
struct list_head list;
|
||||
struct list_head tid_q;
|
||||
@@ -8,7 +8,7 @@
|
||||
};
|
||||
|
||||
struct ath_frame_info {
|
||||
@@ -262,6 +263,8 @@ struct ath_node {
|
||||
@@ -260,6 +261,8 @@ struct ath_node {
|
||||
struct ath_atx_ac ac[WME_NUM_AC];
|
||||
u16 maxampdu;
|
||||
u8 mpdudensity;
|
||||
@@ -17,7 +17,7 @@
|
||||
};
|
||||
|
||||
#define AGGR_CLEANUP BIT(1)
|
||||
@@ -343,6 +346,9 @@ int ath_tx_aggr_start(struct ath_softc *
|
||||
@@ -341,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);
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
|
||||
const struct ieee80211_tx_queue_params *params)
|
||||
{
|
||||
@@ -2130,6 +2151,7 @@ struct ieee80211_ops ath9k_ops = {
|
||||
@@ -2191,6 +2212,7 @@ struct ieee80211_ops ath9k_ops = {
|
||||
.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;
|
||||
@@ -1492,7 +1569,6 @@ static int setup_tx_flags(struct sk_buff
|
||||
@@ -1493,7 +1570,6 @@ static int setup_tx_flags(struct sk_buff
|
||||
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)
|
||||
@@ -1755,6 +1831,9 @@ static void ath_tx_start_dma(struct ath_
|
||||
@@ -1756,6 +1832,9 @@ static void ath_tx_start_dma(struct ath_
|
||||
if (txctl->paprd)
|
||||
bf->bf_state.bfs_paprd_timestamp = jiffies;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user