aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/driver-ops.h6
-rw-r--r--net/mac80211/tx.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index df9203199102..a81117a83996 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -22,9 +22,11 @@ get_bss_sdata(struct ieee80211_sub_if_data *sdata)
22 return sdata; 22 return sdata;
23} 23}
24 24
25static inline void drv_tx(struct ieee80211_local *local, struct sk_buff *skb) 25static inline void drv_tx(struct ieee80211_local *local,
26 struct ieee80211_tx_control *control,
27 struct sk_buff *skb)
26{ 28{
27 local->ops->tx(&local->hw, skb); 29 local->ops->tx(&local->hw, control, skb);
28} 30}
29 31
30static inline void drv_get_et_strings(struct ieee80211_sub_if_data *sdata, 32static inline void drv_get_et_strings(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index acf712ffb5e6..7558ba58ea23 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1204,6 +1204,7 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
1204 struct sk_buff_head *skbs, 1204 struct sk_buff_head *skbs,
1205 bool txpending) 1205 bool txpending)
1206{ 1206{
1207 struct ieee80211_tx_control control;
1207 struct sk_buff *skb, *tmp; 1208 struct sk_buff *skb, *tmp;
1208 unsigned long flags; 1209 unsigned long flags;
1209 1210
@@ -1240,10 +1241,10 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
1240 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); 1241 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
1241 1242
1242 info->control.vif = vif; 1243 info->control.vif = vif;
1243 info->control.sta = sta; 1244 control.sta = sta;
1244 1245
1245 __skb_unlink(skb, skbs); 1246 __skb_unlink(skb, skbs);
1246 drv_tx(local, skb); 1247 drv_tx(local, &control, skb);
1247 } 1248 }
1248 1249
1249 return true; 1250 return true;