mac80211: Avoid ABI change in 4.9.53

Commit 531682159092 ("mac80211: fix VLAN handling with TXQs") replaced
a union with two separate members in ieee80211_tx_info::control.  The
one which changed offset (enqueue_time) doesn't appear to be accessed
outside of the mac80211 module, so this shouldn't be an ABI change for
drivers.  Therefore hide the ABI change from genksyms.

Gbp-Pq: Topic debian
Gbp-Pq: Name mac80211-avoid-abi-change-in-4.9.53.patch

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8fd61bc50383c6f074d493266afe35b3feca787d..b59f5be280a91097f4879d2b4505516694fdb253 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -902,10 +902,19 @@ struct ieee80211_tx_info {
                                unsigned long jiffies;
                        };
                        /* NB: vif can be NULL for injected frames */
+#ifndef __GENKSYMS__
                        struct ieee80211_vif *vif;
+#else
+                       union {
+                               struct ieee80211_vif *vif;
+                               codel_time_t enqueue_time;
+                       };
+#endif
                        struct ieee80211_key_conf *hw_key;
                        u32 flags;
+#ifndef __GENKSYMS__
                        codel_time_t enqueue_time;
+#endif
                } control;
                struct {
                        u64 cookie;