summaryrefslogtreecommitdiff
path: root/backport
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-12-08 16:08:11 +0100
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-12-08 19:30:41 +0100
commit844a6a0893c6753b7760090539db1bfb5c80e7f0 (patch)
treefd92f139de253be213c74996fd710f3802f04dc5 /backport
parent185e78bad33c73f26b817b50ccf05b1ffac5d446 (diff)
backports: so not add netdev_features_t on RHEL 6.5
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>
Diffstat (limited to 'backport')
-rw-r--r--backport/backport-include/linux/netdev_features.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/backport-include/linux/netdev_features.h b/backport/backport-include/linux/netdev_features.h
index ec5b9408..acb7cf8f 100644
--- a/backport/backport-include/linux/netdev_features.h
+++ b/backport/backport-include/linux/netdev_features.h
@@ -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>