Johannes Berg <[email protected]> writes: > diff --git a/include/net/mac80211.h b/include/net/mac80211.h > index b2b5419467cc..263cb30d77c8 100644 > --- a/include/net/mac80211.h > +++ b/include/net/mac80211.h > @@ -919,21 +919,10 @@ struct ieee80211_tx_info { > unsigned long jiffies; > }; > /* NB: vif can be NULL for injected frames */ > - 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_vif *vif; > struct ieee80211_key_conf *hw_key; > u32 flags; > - /* 4 bytes free */ > + codel_time_t enqueue_time;
A side effect of this is that enqueue_time will be valid in the driver; which is good as far as I'm concerned (I've been thinking about using it to make decisions about when to stop retrying a frame). If we want to save the four bytes, is there any reason we can't just change the codel code to use skb->tstamp instead? -Toke
