aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/ieee80211_i.h7
-rw-r--r--net/mac80211/util.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 23765e3ca7bc..54f5b5b299d5 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1432,11 +1432,14 @@ void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,
1432 enum queue_stop_reason reason); 1432 enum queue_stop_reason reason);
1433void ieee80211_add_pending_skb(struct ieee80211_local *local, 1433void ieee80211_add_pending_skb(struct ieee80211_local *local,
1434 struct sk_buff *skb); 1434 struct sk_buff *skb);
1435void ieee80211_add_pending_skbs(struct ieee80211_local *local,
1436 struct sk_buff_head *skbs);
1437void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, 1435void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
1438 struct sk_buff_head *skbs, 1436 struct sk_buff_head *skbs,
1439 void (*fn)(void *data), void *data); 1437 void (*fn)(void *data), void *data);
1438static inline void ieee80211_add_pending_skbs(struct ieee80211_local *local,
1439 struct sk_buff_head *skbs)
1440{
1441 ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
1442}
1440 1443
1441void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, 1444void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
1442 u16 transaction, u16 auth_alg, 1445 u16 transaction, u16 auth_alg,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 5e23cf6389d0..4cb0fd2f5af9 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -404,12 +404,6 @@ void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
404 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); 404 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
405} 405}
406 406
407void ieee80211_add_pending_skbs(struct ieee80211_local *local,
408 struct sk_buff_head *skbs)
409{
410 ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
411}
412
413void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw, 407void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,
414 enum queue_stop_reason reason) 408 enum queue_stop_reason reason)
415{ 409{