diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-08 16:08:11 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-19 21:55:28 +0100 |
| commit | 1134b16ebf3afc48bf1dad49950381e1005fe3f5 (patch) | |
| tree | 5646d3448b9653e34dff5fb672e4dd25cdfe6d14 | |
| parent | d6dd15e4d6cd23c72fd7d7c9faa84d09d6ccc33b (diff) | |
backports: so not add netdev_features_t on RHEL 6.5
Upstream commit: 844a6a0893c6753b7760090539db1bfb5c80e7f0
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>
| -rw-r--r-- | backport/backport-include/linux/netdev_features.h | 2 |
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> |