[dpdk-dev] kni: fix compilation issue on kernel 4.0.0
Commit Message
Due to API changes in function pointer ndo_bridge_setlink
(commit ad41faa8) and the rename of functions vlan_tx_*
(commit df8a39de) in kernel 4.0, DPDK would not build.
This patch adds the properly checks to fix the compilation.
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 6 ++++++
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
Comments
2015-04-28 18:37, Pablo de Lara:
> Due to API changes in function pointer ndo_bridge_setlink
> (commit ad41faa8) and the rename of functions vlan_tx_*
> (commit df8a39de) in kernel 4.0, DPDK would not build.
>
> This patch adds the properly checks to fix the compilation.
>
> Reported-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Pablo, I have another error with Linux 3.19 when KNI vhost is enabled:
lib/librte_eal/linuxapp/kni/kni_vhost.c:365:35: error:
‘struct msghdr’ has no member named ‘msg_iov’
Hi Thomas,
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Wednesday, April 29, 2015 2:20 PM
> To: De Lara Guarch, Pablo
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] kni: fix compilation issue on kernel 4.0.0
>
> 2015-04-28 18:37, Pablo de Lara:
> > Due to API changes in function pointer ndo_bridge_setlink
> > (commit ad41faa8) and the rename of functions vlan_tx_*
> > (commit df8a39de) in kernel 4.0, DPDK would not build.
> >
> > This patch adds the properly checks to fix the compilation.
> >
> > Reported-by: Stephen Hemminger <stephen@networkplumber.org>
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
>
> Pablo, I have another error with Linux 3.19 when KNI vhost is enabled:
>
> lib/librte_eal/linuxapp/kni/kni_vhost.c:365:35: error:
> ‘struct msghdr’ has no member named ‘msg_iov’
Thanks for reporting, I didn't see that. I will send a patch for that as soon as I can.
Pablo
> Due to API changes in function pointer ndo_bridge_setlink
> (commit ad41faa8) and the rename of functions vlan_tx_*
> (commit df8a39de) in kernel 4.0, DPDK would not build.
>
> This patch adds the properly checks to fix the compilation.
>
> Reported-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Applied, thanks
@@ -2198,8 +2198,14 @@ static int igb_ndo_fdb_dump(struct sk_buff *skb,
#endif /* USE_DEFAULT_FDB_DEL_DUMP */
#ifdef HAVE_BRIDGE_ATTRIBS
+#ifdef HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS
+static int igb_ndo_bridge_setlink(struct net_device *dev,
+ struct nlmsghdr *nlh,
+ u16 flags)
+#else
static int igb_ndo_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh)
+#endif /* HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS */
{
struct igb_adapter *adapter = netdev_priv(dev);
struct e1000_hw *hw = &adapter->hw;
@@ -3885,4 +3885,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#define HAVE_NDO_FDB_ADD_VID
#endif /* >= 3.19.0 */
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) )
+/* vlan_tx_xx functions got renamed to skb_vlan */
+#define vlan_tx_tag_get skb_vlan_tag_get
+#define vlan_tx_tag_present skb_vlan_tag_present
+#define HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS
+#endif /* 4.0.0 */
#endif /* _KCOMPAT_H_ */