Merge branch 'stmmac-next'

[deliverable/linux.git] / include / net / mac80211.h

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index be30b0549b881847adfc45cba4303e6bae82d060..a52009ffc19fda072c61cc4e0676b256c069d747 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -21,6 +21,7 @@
 #include <linux/skbuff.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
+#include <net/codel.h>
 #include <asm/unaligned.h>
 
 /**
@@ -895,7 +896,18 @@ struct ieee80211_tx_info {
                                unsigned long jiffies;
                        };
                        /* NB: vif can be NULL for injected frames */
-                       struct ieee80211_vif *vif;
+                       union {
+                               /* NB: vif can be NULL for injected frames */
+                               struct ieee80211_vif *vif;
+
+                               /* When packets are enqueued on txq it's easy
+                                * to re-construct the vif pointer. There's no
+                                * more space in tx_info so it can be used to
+                                * store the necessary enqueue time for packet
+                                * sojourn time computation.
+                                */
+                               codel_time_t enqueue_time;
+                       };
                        struct ieee80211_key_conf *hw_key;
                        u32 flags;
                        /* 4 bytes free */
@@ -2147,9 +2159,6 @@ enum ieee80211_hw_flags {
  * @n_cipher_schemes: a size of an array of cipher schemes definitions.
  * @cipher_schemes: a pointer to an array of cipher scheme definitions
  *     supported by HW.
- *
- * @txq_ac_max_pending: maximum number of frames per AC pending in all txq
- *     entries for a vif.
  */
 struct ieee80211_hw {
        struct ieee80211_conf conf;
@@ -2180,7 +2189,6 @@ struct ieee80211_hw {
        u8 uapsd_max_sp_len;
        u8 n_cipher_schemes;
        const struct ieee80211_cipher_scheme *cipher_schemes;
-       int txq_ac_max_pending;
 };
 
 static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,