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

3 messages, 3 authors, 2021-08-05 · open the first message on its own page

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

From: Mark Brown <broonie@kernel.org>
Date: 2021-08-05 12:02:16

Hi all,

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

/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe':
/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:611:8: error: too few arguments to function 'mhi_prepare_for_transfer'
  err = mhi_prepare_for_transfer(mhi_dev);
        ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:18:
/tmp/next/build/include/linux/mhi.h:726:5: note: declared here
 int mhi_prepare_for_transfer(struct mhi_device *mhi_dev,
     ^~~~~~~~~~~~~~~~~~~~~~~~


Caused by commit

   aa730a9905b7b079ef2ff ("net: wwan: Add MHI MBIM network driver")

That API has been modified in ce78ffa3ef16810 ("net: really fix the
build...") in the net tree.  I've used the net-next tree from yesterday.

Re: linux-next: build failure after merge of the net-next tree

From: David Miller <davem@davemloft.net>
Date: 2021-08-05 12:12:19

From: Mark Brown <broonie@kernel.org>
Date: Thu,  5 Aug 2021 13:01:38 +0100
Hi all,

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

/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe':
/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:611:8: error: too few arguments to function 'mhi_prepare_for_transfer'
  err = mhi_prepare_for_transfer(mhi_dev);
        ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:18:
/tmp/next/build/include/linux/mhi.h:726:5: note: declared here
 int mhi_prepare_for_transfer(struct mhi_device *mhi_dev,
     ^~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit

   aa730a9905b7b079ef2ff ("net: wwan: Add MHI MBIM network driver")

That API has been modified in ce78ffa3ef16810 ("net: really fix the
build...") in the net tree.  I've used the net-next tree from yesterday.
Should be fixed now, thanks.

Re: linux-next: build failure after merge of the net-next tree

From: Loic Poulain <hidden>
Date: 2021-08-05 12:24:25

On Thu, 5 Aug 2021 at 14:01, Mark Brown [off-list ref] wrote:
Hi all,

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

/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe':
/tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:611:8: error: too few arguments to function 'mhi_prepare_for_transfer'
  err = mhi_prepare_for_transfer(mhi_dev);
        ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:18:
/tmp/next/build/include/linux/mhi.h:726:5: note: declared here
 int mhi_prepare_for_transfer(struct mhi_device *mhi_dev,
     ^~~~~~~~~~~~~~~~~~~~~~~~


Caused by commit

   aa730a9905b7b079ef2ff ("net: wwan: Add MHI MBIM network driver")
Thanks for reporting, I see David already fixed the issue in net-next tree.
Actually, we also need the same change for mhi_net driver to fix
7ffa7542eca6 ("net: mhi: Remove MBIM protocol").
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
index d127eb6..975f7f9 100644
--- a/drivers/net/mhi_net.c
+++ b/drivers/net/mhi_net.c
@@ -319,7 +319,7 @@ static int mhi_net_newlink(struct mhi_device
*mhi_dev, struct net_device *ndev)
        u64_stats_init(&mhi_netdev->stats.tx_syncp);

        /* Start MHI channels */
-       err = mhi_prepare_for_transfer(mhi_dev);
+       err = mhi_prepare_for_transfer(mhi_dev, 0);
        if (err)
                goto out_err;

Regards,
Loic
That API has been modified in ce78ffa3ef16810 ("net: really fix the
build...") in the net tree.  I've used the net-next tree from yesterday.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help