backports: move net_device_priv_flags

These flags are now defined in linux/netdevice.h and not in linux/if.h
any more. This patch also removed some defined in all kernel versions
since 3.0.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/backport/backport-include/linux/if.h b/backport/backport-include/linux/if.h
deleted file mode 100644 (file)
index 1045466..0000000
--- a/backport/backport-include/linux/if.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _BACKPORT_LINUX_IF_H
-#define _BACKPORT_LINUX_IF_H
-#include_next <linux/if.h>
-#include <linux/version.h>
-
-/* mask IFF_DONT_BRIDGE as RHEL6 backports this */
-#if !defined(IFF_DONT_BRIDGE)
-#define IFF_DONT_BRIDGE 0x800          /* disallow bridging this ether dev */
-#endif
-
-#ifndef  IFF_TX_SKB_SHARING
-#define IFF_TX_SKB_SHARING     0x10000
-#endif
-
-#ifndef IFF_LIVE_ADDR_CHANGE
-#define IFF_LIVE_ADDR_CHANGE 0x100000
-#endif
-
-#ifndef IFF_SUPP_NOFCS
-#define IFF_SUPP_NOFCS 0x80000         /* device supports sending custom FCS */
-#endif
-
-#ifndef IFF_UNICAST_FLT
-#define IFF_UNICAST_FLT        0x20000         /* Supports unicast filtering   */
-#endif
-
-#endif /* _BACKPORT_LINUX_IF_H */

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index 2abb47d747c859189f483ee1621a1a38f603f734..6979758895b9dd5d600b0bf6ca85aa71c33adb2a 100644 (file)
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -145,4 +145,16 @@ static inline void netdev_reset_queue(struct net_device *dev_queue)
 #define napi_gro_flush(napi, old) napi_gro_flush(napi)
 #endif
 
+#ifndef IFF_LIVE_ADDR_CHANGE
+#define IFF_LIVE_ADDR_CHANGE 0x100000
+#endif
+
+#ifndef IFF_SUPP_NOFCS
+#define IFF_SUPP_NOFCS 0x80000         /* device supports sending custom FCS */
+#endif
+
+#ifndef IFF_UNICAST_FLT
+#define IFF_UNICAST_FLT        0x20000         /* Supports unicast filtering   */
+#endif
+
 #endif /* __BACKPORT_NETDEVICE_H */