* [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
@ 2017-04-04 13:19 Nirmoy Das
2017-04-04 13:43 ` Ferruh Yigit
2017-04-04 14:16 ` [PATCH v3] " Nirmoy Das
0 siblings, 2 replies; 5+ messages in thread
From: Nirmoy Das @ 2017-04-04 13:19 UTC (permalink / raw)
To: dev; +Cc: 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 | 9 +++++++--
1 file changed, 7 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..173599ccd 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -710,6 +710,9 @@ struct _kc_ethtool_pauseparam {
#elif ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,28) )
/* SLES12 is at least 3.12.28+ based */
#define SLE_VERSION_CODE SLE_VERSION(12,0,0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+/* SLES12SP3 is at least 4.4.57+ based */
+#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
#endif /* CONFIG_SUSE_KERNEL */
#ifndef SLE_VERSION_CODE
@@ -3929,8 +3932,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(SLE_VERSION_CODE) && \
+ (SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0))))
#define HAVE_VF_VLAN_PROTO
-#endif /* >= 4.9.0 */
+#endif /* >= 4.9.0, >= SLES12SP3 */
#endif /* _KCOMPAT_H_ */
--
2.12.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
2017-04-04 13:19 [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3 Nirmoy Das
@ 2017-04-04 13:43 ` Ferruh Yigit
2017-04-04 14:16 ` [PATCH v3] " Nirmoy Das
1 sibling, 0 replies; 5+ messages in thread
From: Ferruh Yigit @ 2017-04-04 13:43 UTC (permalink / raw)
To: Nirmoy Das, dev
On 4/4/2017 2:19 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 | 9 +++++++--
> 1 file changed, 7 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..173599ccd 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> @@ -710,6 +710,9 @@ struct _kc_ethtool_pauseparam {
> #elif ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,28) )
> /* SLES12 is at least 3.12.28+ based */
> #define SLE_VERSION_CODE SLE_VERSION(12,0,0)
> +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
> +/* SLES12SP3 is at least 4.4.57+ based */
> +#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
> #endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
> #endif /* CONFIG_SUSE_KERNEL */
> #ifndef SLE_VERSION_CODE
> @@ -3929,8 +3932,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(SLE_VERSION_CODE) && \
> + (SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0))))
> #define HAVE_VF_VLAN_PROTO
> -#endif /* >= 4.9.0 */
> +#endif /* >= 4.9.0, >= SLES12SP3 */
Is it possible to use SLE_VERSION_CODE check same as rest of the document?:
(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0))
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) || \
(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0)))
#define HAVE_VF_VLAN_PROTO
#endif /* >= 4.9.0, >= SLES12SP3 */
>
> #endif /* _KCOMPAT_H_ */
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
2017-04-04 13:19 [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3 Nirmoy Das
2017-04-04 13:43 ` Ferruh Yigit
@ 2017-04-04 14:16 ` Nirmoy Das
2017-04-04 14:46 ` Ferruh Yigit
1 sibling, 1 reply; 5+ messages in thread
From: Nirmoy Das @ 2017-04-04 14:16 UTC (permalink / raw)
To: dev; +Cc: 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 | 8 ++++++--
1 file changed, 6 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..4abab4aa3 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -710,6 +710,9 @@ struct _kc_ethtool_pauseparam {
#elif ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,28) )
/* SLES12 is at least 3.12.28+ based */
#define SLE_VERSION_CODE SLE_VERSION(12,0,0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+/* SLES12SP3 is at least 4.4.57+ based */
+#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
#endif /* CONFIG_SUSE_KERNEL */
#ifndef SLE_VERSION_CODE
@@ -3929,8 +3932,9 @@ 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)) || \
+ (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0)))
#define HAVE_VF_VLAN_PROTO
-#endif /* >= 4.9.0 */
+#endif /* >= 4.9.0, >= SLES12SP3 */
#endif /* _KCOMPAT_H_ */
--
2.12.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
2017-04-04 14:16 ` [PATCH v3] " Nirmoy Das
@ 2017-04-04 14:46 ` Ferruh Yigit
2017-04-04 15:12 ` Thomas Monjalon
0 siblings, 1 reply; 5+ messages in thread
From: Ferruh Yigit @ 2017-04-04 14:46 UTC (permalink / raw)
To: Nirmoy Das, dev; +Cc: Thomas Monjalon
On 4/4/2017 3:16 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>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
2017-04-04 14:46 ` Ferruh Yigit
@ 2017-04-04 15:12 ` Thomas Monjalon
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2017-04-04 15:12 UTC (permalink / raw)
To: Nirmoy Das; +Cc: Ferruh Yigit, dev
2017-04-04 15:46, Ferruh Yigit:
> On 4/4/2017 3:16 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>
>
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Applied, thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-04 15:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-04 13:19 [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3 Nirmoy Das
2017-04-04 13:43 ` Ferruh Yigit
2017-04-04 14:16 ` [PATCH v3] " Nirmoy Das
2017-04-04 14:46 ` Ferruh Yigit
2017-04-04 15:12 ` Thomas Monjalon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.