[1/2] kni: fix build for 5.0 for dev_open()
Checks
Commit Message
Build error seen with Linux kernel 5.0 and
when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.
build error:
.../build/build/kernel/linux/kni/ixgbe_ethtool.c:1746:4:
error: too few arguments to function ‘dev_open’
dev_open(netdev);
^~~~~~~~
In file included from .../build/kernel/linux/kni/ixgbe_ethtool.c:18:
.../linux/linux/include/linux/netdevice.h:2620:5: note: declared here
int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
^~~~~~~~
.../build/build/kernel/linux/kni/igb_ethtool.c:1812:4:
error: too few arguments to function ‘dev_open’
dev_open(netdev);
^~~~~~~~
In file included from .../build/build/kernel/linux/kni/igb_ethtool.c:15:
.../linux/linux/include/linux/netdevice.h:2620:5: note: declared here
int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
^~~~~~~~
dev_open() is changed in Linux kernel version 5.0 and now requires
a new parameter, 'struct netlink_ext_ack *extack'.
Fixed by defining dev_open as macro when kernel version >= 5.0
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
kernel/linux/kni/ethtool/igb/kcompat.h | 4 ++++
kernel/linux/kni/ethtool/ixgbe/kcompat.h | 4 ++++
2 files changed, 8 insertions(+)
Comments
On 1/22/2019 3:44 PM, Ferruh Yigit wrote:
> Build error seen with Linux kernel 5.0 and
> when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.
>
> build error:
> .../build/build/kernel/linux/kni/ixgbe_ethtool.c:1746:4:
> error: too few arguments to function ‘dev_open’
> dev_open(netdev);
> ^~~~~~~~
> In file included from .../build/kernel/linux/kni/ixgbe_ethtool.c:18:
> .../linux/linux/include/linux/netdevice.h:2620:5: note: declared here
> int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
> ^~~~~~~~
>
> .../build/build/kernel/linux/kni/igb_ethtool.c:1812:4:
> error: too few arguments to function ‘dev_open’
> dev_open(netdev);
> ^~~~~~~~
> In file included from .../build/build/kernel/linux/kni/igb_ethtool.c:15:
> .../linux/linux/include/linux/netdevice.h:2620:5: note: declared here
> int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
> ^~~~~~~~
>
> dev_open() is changed in Linux kernel version 5.0 and now requires
> a new parameter, 'struct netlink_ext_ack *extack'.
> Fixed by defining dev_open as macro when kernel version >= 5.0
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Off the topic.
This is the patch 50000 in patchwork! This is a big number.
Thanks everyone contributed!
https://patches.dpdk.org/patch/50000/
The historical numbers from DPDK patchwork:
50000 - Jan. 22, 2019 (253 days) [ 8 months, 8 days / 36 weeks and 1 day ]
40000 - May. 14, 2018 (217 days)
30000 - Oct. 9, 2017 (258 days)
20000 - Jan. 25, 2017 (372 days)
10000 - Jan. 20, 2016 (645 days)
00001 - April 16, 2014
This is the first time DPDK patch pace slowed down (slightly), I guess this is
because of the holidays in the middle and small 19.02, but I think next
milestone which includes 19.05 will clarify this.
22/01/2019 16:44, Ferruh Yigit:
> dev_open() is changed in Linux kernel version 5.0 and now requires
> a new parameter, 'struct netlink_ext_ack *extack'.
> Fixed by defining dev_open as macro when kernel version >= 5.0
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Series applied, thanks
and congratulations for the patch 50000.
I suspect you were waiting for posting it at the right time :)
On 1/23/2019 9:39 PM, Thomas Monjalon wrote:
> 22/01/2019 16:44, Ferruh Yigit:
>> dev_open() is changed in Linux kernel version 5.0 and now requires
>> a new parameter, 'struct netlink_ext_ack *extack'.
>> Fixed by defining dev_open as macro when kernel version >= 5.0
>>
>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>
> Series applied, thanks
> and congratulations for the patch 50000.
> I suspect you were waiting for posting it at the right time :)
just coincidence ;)
@@ -3940,6 +3940,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#define HAVE_PCI_ENABLE_MSIX
#endif
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) )
+#define dev_open(x) dev_open(x, NULL)
+#endif /* >= 5.0.0 */
+
#if defined(timer_setup) && defined(from_timer)
#define HAVE_TIMER_SETUP
#endif
@@ -3125,6 +3125,10 @@ static inline int __kc_pci_vfs_assigned(struct pci_dev *dev)
#define SET_ETHTOOL_OPS(netdev, ops) ((netdev)->ethtool_ops = (ops))
#endif /* >= 3.16.0 */
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) )
+#define dev_open(x) dev_open(x, NULL)
+#endif /* >= 5.0.0 */
+
/*
* vlan_tx_tag_* macros renamed to skb_vlan_tag_* (Linux commit: df8a39defad4)
* For older kernels backported this commit, need to use renamed functions.