aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-09-25 13:06:54 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 14:34:11 -0400
commitf6f3def323e5d60cc2a5659533dce547c0aac5fc (patch)
tree9e5470eb3301c588f3ec75cc3f0ce504b50d77d5 /net/mac80211/ieee80211_i.h
parentf70f01c2ebbe31fbd8a96be3b45c5620dac45b96 (diff)
mac80211: save tx params per sdata
save and configure tx param per sdata, rather than per hardware. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 4822d69930e2..5cadcbbc9a57 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -609,6 +609,8 @@ struct ieee80211_sub_if_data {
609 __be16 control_port_protocol; 609 __be16 control_port_protocol;
610 bool control_port_no_encrypt; 610 bool control_port_no_encrypt;
611 611
612 struct ieee80211_tx_queue_params tx_conf[IEEE80211_MAX_QUEUES];
613
612 struct work_struct work; 614 struct work_struct work;
613 struct sk_buff_head skb_queue; 615 struct sk_buff_head skb_queue;
614 616
@@ -751,7 +753,6 @@ struct ieee80211_local {
751 struct workqueue_struct *workqueue; 753 struct workqueue_struct *workqueue;
752 754
753 unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES]; 755 unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES];
754 struct ieee80211_tx_queue_params tx_conf[IEEE80211_MAX_QUEUES];
755 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 756 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
756 spinlock_t queue_stop_reason_lock; 757 spinlock_t queue_stop_reason_lock;
757 758