From: Johannes Berg <johannes.berg@xxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/compat-3.3.h | 2 -- backport/backport-include/linux/netdev_features.h | 15 +++++++++++++++ backport/backport-include/linux/netdevice.h | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 backport/backport-include/linux/netdev_features.h create mode 100644 backport/backport-include/linux/netdevice.h diff --git a/backport/backport-include/linux/compat-3.3.h b/backport/backport-include/linux/compat-3.3.h index 72686da..7b2ec47 100644 --- a/backport/backport-include/linux/compat-3.3.h +++ b/backport/backport-include/linux/compat-3.3.h @@ -307,8 +307,6 @@ static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz) #define NL80211_FEATURE_SK_TX_STATUS 0 -typedef u32 netdev_features_t; - /* source include/linux/device.h */ /** * module_driver() - Helper macro for drivers that don't do anything diff --git a/backport/backport-include/linux/netdev_features.h b/backport/backport-include/linux/netdev_features.h new file mode 100644 index 0000000..a7394f4 --- /dev/null +++ b/backport/backport-include/linux/netdev_features.h @@ -0,0 +1,15 @@ +#ifndef __BACKPORT_NETDEV_FEATURES_H +#define __BACKPORT_NETDEV_FEATURES_H + +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) +#include <linux/netdevice.h> +#include <linux/types.h> + +typedef u32 netdev_features_t; +#else +#include_next <linux/netdev_features.h> +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */ + +#endif /* __BACKPORT_NETDEV_FEATURES_H */ diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h new file mode 100644 index 0000000..4971239 --- /dev/null +++ b/backport/backport-include/linux/netdevice.h @@ -0,0 +1,6 @@ +#ifndef __BACKPORT_NETDEVICE_H +#define __BACKPORT_NETDEVICE_H +#include_next <linux/netdevice.h> +#include <linux/netdev_features.h> + +#endif /* __BACKPORT_NETDEVICE_H */ -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
