[dpdk-dev] [PATCH v3] kni: fix compilation issue in KNI vhost on kernel 3.19/4.0

[Thomas Monjalon]

2015-05-10 23:01, De Lara Guarch, Pablo:
> From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com]
> > I have the following errors with Linux 4.0.1:
> > 
> > lib/librte_eal/linuxapp/kni/igb_main.c:2321:2: error: initialization from
> > incompatible pointer type
> >   .ndo_bridge_setlink = igb_ndo_bridge_setlink,
> >   ^
> > lib/librte_eal/linuxapp/kni/igb_main.c:2321:2: error: (near initialization for
> > ‘igb_netdev_ops.ndo_bridge_setlink’)
> > lib/librte_eal/linuxapp/kni/igb_main.c: In function ‘igb_xmit_frame_ring’:
> > lib/librte_eal/linuxapp/kni/igb_main.c:5482:2: error: implicit declaration of
> > function ‘vlan_tx_tag_present’
> >   if (vlan_tx_tag_present(skb)) {
> >   ^
> > lib/librte_eal/linuxapp/kni/igb_main.c:5484:3: error: implicit declaration of
> > function ‘vlan_tx_tag_get’
> >    tx_flags |= (vlan_tx_tag_get(skb) << IGB_TX_FLAGS_VLAN_SHIFT);
> >    ^
> 
> I sent a patch for that (kni: fix compilation issue on kernel 4.0.0), by the end of last month.

Oh yes, you're right, sorry.

> Is it OK to merge it or do you want me to send a v4 of this one, including that fix?

Separate patches are OK, thanks.