linux-next: build failure after merge of the vhost tree

[Stephen Rothwell]

Hi all,

After merging the vhost tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: error: initialization of 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types]
 2889 |  .ndo_tx_timeout  = atlx_tx_timeout,
      |                     ^~~~~~~~~~~~~~~
drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: note: (near initialization for 'atl1_netdev_ops.ndo_tx_timeout')

Caused by commit

  29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")

I applied the following patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 4 Dec 2019 14:13:18 +1100
Subject: [PATCH] netdev: another fix for "netdev: pass the stuck queue to the
 timeout handler"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/net/ethernet/atheros/atlx/atlx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index 505a22c703f7..0941d07d0833 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
  * atlx_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
-static void atlx_tx_timeout(struct net_device *netdev)
+static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)
 {
 	struct atlx_adapter *adapter = netdev_priv(netdev);
 	/* Do the reset outside of interrupt context */
-- 
2.24.0

Then I got another build failure:

drivers/net/ethernet/natsemi/ns83820.c: In function 'ns83820_tx_watch':
drivers/net/ethernet/natsemi/ns83820.c:1606:3: error: too few arguments to function 'ns83820_tx_timeout'
 1606 |   ns83820_tx_timeout(ndev);
      |   ^~~~~~~~~~~~~~~~~~
drivers/net/ethernet/natsemi/ns83820.c:1552:13: note: declared here
 1552 | static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
      |             ^~~~~~~~~~~~~~~~~~

At this point, I just used the vhost tree from next-20191203 ...
-- 
Cheers,
Stephen Rothwell

Attachment: pgpxDO7B_zVDL.pgp
Description: OpenPGP digital signature