| Message ID | 1545372231-45810-1-git-send-email-zengxhsh@cn.ibm.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Thomas Monjalon |
| Headers | show |
| Series | kni: fix build on RHEL 7.6-ALT on IBM POWER9 | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | warning | coding style issues |
| ci/Intel-compilation | success | Compilation OK |
| ci/mellanox-Performance-Testing | success | Performance Testing PASS |
| ci/intel-Performance-Testing | success | Performance Testing PASS |
On 12/21/2018 6:03 AM, David Zeng wrote: > Signed-off-by: David Zeng <zengxhsh@cn.ibm.com> > --- > kernel/linux/kni/compat.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h > index 5aadebb..1afa3b8 100644 > --- a/kernel/linux/kni/compat.h > +++ b/kernel/linux/kni/compat.h > @@ -102,8 +102,14 @@ > #undef NET_NAME_UNKNOWN > #endif > > +/* > + * RHEL has two different version with different kernel version: > + * 3.10 is for AMD, Intel, IBM POWER7 and POWER8; > + * 4.14 is for ARM and IBM POWER9 > + */ > #if (defined(RHEL_RELEASE_CODE) && \ > - (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5))) > + (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \ > + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))) > #define ndo_change_mtu ndo_change_mtu_rh74 > #endif Do you need to update 'kernel/linux/kni/ethtool/igb/kcompat.h' for same check? Also there is another update on same line for RHEL8 fix [1], if you can rebase on top of it makes maintainers life easier. [1] https://patches.dpdk.org/patch/49104/ Thanks, ferruh
Thanks, Ferruh!
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 5aadebb..1afa3b8 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -102,8 +102,14 @@ #undef NET_NAME_UNKNOWN #endif +/* + * RHEL has two different version with different kernel version: + * 3.10 is for AMD, Intel, IBM POWER7 and POWER8; + * 4.14 is for ARM and IBM POWER9 + */ #if (defined(RHEL_RELEASE_CODE) && \ - (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5))) + (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))) #define ndo_change_mtu ndo_change_mtu_rh74 #endif
Signed-off-by: David Zeng <zengxhsh@cn.ibm.com> --- kernel/linux/kni/compat.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)