backports: so not add netdev_features_t on RHEL 6.5
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 8 Dec 2013 15:08:11 +0000 (16:08 +0100)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Sun, 8 Dec 2013 18:30:41 +0000 (19:30 +0100)
RHEL 6.5 already contains netdev_features_t which will collide with
backports definition.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
backport/backport-include/linux/netdev_features.h

index ec5b940852ee292908be443ec0a69716ecc44d60..acb7cf8fd2750612ee7739bb508005013244793b 100644 (file)
@@ -18,7 +18,9 @@
 #define NETIF_F_HW_VLAN_CTAG_FILTER            NETIF_F_HW_VLAN_FILTER
 #endif
 
+#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,5)
 typedef u32 netdev_features_t;
+#endif
 #else
 #include_next <linux/netdev_features.h>