Re: [PATCH RFC net-next v8 1/3] netdev: pass the stuck queue to the timeout handler
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: 2019-12-09 07:40:06
Hi Michael, On Tue, Dec 3, 2019 at 9:21 PM Michael S. Tsirkin [off-list ref] wrote:
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue. The patch was generated with the following script:
[...]
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
quoted hunk
--- a/drivers/net/ethernet/8390/8390p.c +++ b/drivers/net/ethernet/8390/8390p.c@@ -41,9 +41,9 @@ void eip_set_multicast_list(struct net_device *dev) } EXPORT_SYMBOL(eip_set_multicast_list); -void eip_tx_timeout(struct net_device *dev) +void eip_tx_timeout(struct net_device *dev, unsigned int txqueue) { - __ei_tx_timeout(dev); + __ei_tx_timeout(dev, txqueue); } EXPORT_SYMBOL(eip_tx_timeout);
On Mon, Dec 9, 2019 at 6:37 AM [off-list ref] wrote:
FAILED linux-next/m68k-defconfig/m68k Mon Dec 09, 16:34 http://kisskb.ellerman.id.au/kisskb/buildresult/14060060/ Commit: Add linux-next specific files for 20191209 6cf8298daad041cd15dc514d8a4f93ca3636c84e Compiler: m68k-linux-gcc (GCC) 4.6.3 / GNU ld (GNU Binutils) 2.22 Possible errors --------------- drivers/net/ethernet/8390/8390p.c:44:6: error: conflicting types for 'eip_tx_timeout' drivers/net/ethernet/8390/8390p.c:48:1: error: conflicting types for 'eip_tx_timeout' make[5]: *** [scripts/Makefile.build:266: drivers/net/ethernet/8390/8390p.o] Error 1 make[4]: *** [scripts/Makefile.build:503: drivers/net/ethernet/8390] Error 2 make[3]: *** [scripts/Makefile.build:503: drivers/net/ethernet] Error 2 make[2]: *** [scripts/Makefile.build:503: drivers/net] Error 2 make[1]: *** [Makefile:1693: drivers] Error 2 make: *** [Makefile:179: sub-make] Error 2
Looks like you forgot to update the forward declaration in drivers/net/ethernet/8390/8390.h There may be others... http://kisskb.ellerman.id.au/kisskb/head/6cf8298daad041cd15dc514d8a4f93ca3636c84e/ Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds