[PATCH] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3

[PATCH] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3

[Nirmoy Das]

Add support for SLES12SP3, which uses kernel 4.4,
but backported features from newer kernels.

Signed-off-by: Nirmoy Das <ndas@suse.de>
---
 lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 84826b26e..3d22d8e69 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3929,8 +3929,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #define vlan_tx_tag_present skb_vlan_tag_present
 #endif
 
-#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) )
+#if (( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) \
+    || (defined(CONFIG_SUSE_KERNEL) && \
+       (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,57))))
 #define HAVE_VF_VLAN_PROTO
-#endif /* >= 4.9.0 */
+#endif /* >= 4.9.0, >= SLES12SP3 */
 
 #endif /* _KCOMPAT_H_ */
-- 
2.12.0

Re: [PATCH] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3

[Ferruh Yigit]

On 3/31/2017 12:32 PM, Nirmoy Das wrote:
> Add support for SLES12SP3, which uses kernel 4.4,
> but backported features from newer kernels.
> 
> Signed-off-by: Nirmoy Das <ndas@suse.de>
> ---
>  lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> index 84826b26e..3d22d8e69 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> @@ -3929,8 +3929,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
>  #define vlan_tx_tag_present skb_vlan_tag_present
>  #endif
>  
> -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) )
> +#if (( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) \
> +    || (defined(CONFIG_SUSE_KERNEL) && \
> +       (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,57))))
>  #define HAVE_VF_VLAN_PROTO
> -#endif /* >= 4.9.0 */
> +#endif /* >= 4.9.0, >= SLES12SP3 */

To make condition simple, what about separating SUSE related check?

There is already "#ifdef CONFIG_SUSE_KERNEL" check in line 699, which is
mainly to set SLE_VERSION_CODE, but this check can be added end of that
block, what do you think?

Thanks,
ferruh

>  
>  #endif /* _KCOMPAT_H_ */
> 

Re: [PATCH] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3

[Nirmoy Das]

On 03/31/2017 04:10 PM, Ferruh Yigit wrote:
> On 3/31/2017 12:32 PM, Nirmoy Das wrote:
>> Add support for SLES12SP3, which uses kernel 4.4,
>> but backported features from newer kernels.
>>
>> Signed-off-by: Nirmoy Das <ndas@suse.de>
>> ---
>>  lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> index 84826b26e..3d22d8e69 100644
>> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> @@ -3929,8 +3929,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
>>  #define vlan_tx_tag_present skb_vlan_tag_present
>>  #endif
>>  
>> -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) )
>> +#if (( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) \
>> +    || (defined(CONFIG_SUSE_KERNEL) && \
>> +       (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,57))))
>>  #define HAVE_VF_VLAN_PROTO
>> -#endif /* >= 4.9.0 */
>> +#endif /* >= 4.9.0, >= SLES12SP3 */
> 
> To make condition simple, what about separating SUSE related check?
> 
> There is already "#ifdef CONFIG_SUSE_KERNEL" check in line 699, which is
> mainly to set SLE_VERSION_CODE, but this check can be added end of that
> block, what do you think?
> 
Thanks, looks like I missed that. I will come up with V2.

> Thanks,
> ferruh
> 
>>  
>>  #endif /* _KCOMPAT_H_ */
>>
> 
Regards,
Nirmoy
-- 
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB
21284 (AG Nürnberg) Maxfeldstr. 5
D-90409 Nürnberg / Phone: +49-911-740 18-4