linux-next: build failure after merge of the wireless-drivers-next tree

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi all,

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

drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
  dev->destructor = free_netdev;
     ^

Caused by commit

  98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")

interacting with commit

  cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")

from the net tree.

I applied this merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Jun 2017 12:24:08 +1000
Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
 release of private netdev state."

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
index c5ac252464f4..f053532c0e87 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/core.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
@@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
 	vif->netdev = dev;
 
 	dev->netdev_ops = &qtnf_netdev_ops;
-	dev->destructor = free_netdev;
+	dev->needs_free_netdev = true;
 	dev_net_set(dev, wiphy_net(wiphy));
 	dev->ieee80211_ptr = &vif->wdev;
 	dev->ieee80211_ptr->iftype = iftype;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

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

[Igor Mitsyanko]

On 06/07/2017 07:27 PM, Stephen Rothwell wrote:
> 
> External Email
> 
> 
> Hi all,
> 
> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
> 
> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>    dev->destructor = free_netdev;
>       ^
> 
> Caused by commit
> 
>    98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")
> 
> interacting with commit
> 
>    cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> 
> from the net tree.
> 
> I applied this merge fix patch for today.

Hi Stephen,
thanks. As I understand, you've applied this patch during a merge and no 
further actions are required, correct?


> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Jun 2017 12:24:08 +1000
> Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
>   release of private netdev state."
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>

> ---
>   drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
> index c5ac252464f4..f053532c0e87 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/core.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
> @@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
>          vif->netdev = dev;
> 
>          dev->netdev_ops = &qtnf_netdev_ops;
> -       dev->destructor = free_netdev;
> +       dev->needs_free_netdev = true;
>          dev_net_set(dev, wiphy_net(wiphy));
>          dev->ieee80211_ptr = &vif->wdev;
>          dev->ieee80211_ptr->iftype = iftype;
> --
> 2.11.0
> 
> --
> Cheers,
> Stephen Rothwell
> 

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

[Stephen Rothwell]

Hi Igor,

On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:
>
> thanks. As I understand, you've applied this patch during a merge and no 
> further actions are required, correct?

Dave Miller will need to apply that patch (or something similar) when
he merges the wireless-drivers-next tree into the net-next tree.  I
will keep applying the patch each day until then.
-- 
Cheers,
Stephen Rothwell

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

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Igor,
>
> On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:
>>
>> thanks. As I understand, you've applied this patch during a merge and no 
>> further actions are required, correct?
>
> Dave Miller will need to apply that patch (or something similar) when
> he merges the wireless-drivers-next tree into the net-next tree.  I
> will keep applying the patch each day until then.

Thanks, I'll remind Dave about this when i submit the pull request (very
soon now).

-- 
Kalle Valo

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

[Stephen Rothwell]

Hi Kalle,

On Thu, 08 Jun 2017 15:07:00 +0300 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:  
> >>
> >> thanks. As I understand, you've applied this patch during a merge and no 
> >> further actions are required, correct?  
> >
> > Dave Miller will need to apply that patch (or something similar) when
> > he merges the wireless-drivers-next tree into the net-next tree.  I
> > will keep applying the patch each day until then.  
> 
> Thanks, I'll remind Dave about this when i submit the pull request (very
> soon now).

It occurred to me just after I wrote the previous message that it would
only be true after he merges the current net tree into the net-next tree.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Dave,

On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
> 
> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>   dev->destructor = free_netdev;
>      ^
> 
> Caused by commit
> 
>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")

This commit is now in the net-next tree ...

> interacting with commit
> 
>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> 
> from the net tree.
> 
> I applied this merge fix patch for today.

So this merge fix patch is needed when the net and net-next trees are merged.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Jun 2017 12:24:08 +1000
> Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
>  release of private netdev state."
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
> index c5ac252464f4..f053532c0e87 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/core.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
> @@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
>  	vif->netdev = dev;
>  
>  	dev->netdev_ops = &qtnf_netdev_ops;
> -	dev->destructor = free_netdev;
> +	dev->needs_free_netdev = true;
>  	dev_net_set(dev, wiphy_net(wiphy));
>  	dev->ieee80211_ptr = &vif->wdev;
>  	dev->ieee80211_ptr->iftype = iftype;
> -- 
> 2.11.0

-- 
Cheers,
Stephen Rothwell

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jun 2017 12:00:24 +1000

> Hi Dave,
> 
> On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (x86_64 allmodconfig) failed like this:
>> 
>> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
>> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>>   dev->destructor = free_netdev;
>>      ^
>> 
>> Caused by commit
>> 
>>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")
> 
> This commit is now in the net-next tree ...
> 
>> interacting with commit
>> 
>>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
>> 
>> from the net tree.
>> 
>> I applied this merge fix patch for today.
> 
> So this merge fix patch is needed when the net and net-next trees are merged.

This is now all resolved, thanks!

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

[Stephen Rothwell]

Hi Dave,

On Thu, 15 Jun 2017 12:08:08 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Jun 2017 12:00:24 +1000
> 
> > On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> >>
> >> After merging the wireless-drivers-next tree, today's linux-next build
> >> (x86_64 allmodconfig) failed like this:
> >> 
> >> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> >> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
> >>   dev->destructor = free_netdev;
> >>      ^
> >> 
> >> Caused by commit
> >> 
> >>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")  
> > 
> > This commit is now in the net-next tree ...
> >   
> >> interacting with commit
> >> 
> >>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> >> 
> >> from the net tree.
> >> 
> >> I applied this merge fix patch for today.  
> > 
> > So this merge fix patch is needed when the net and net-next trees are merged.  
> 
> This is now all resolved, thanks!

Thanks for letting me know.

-- 
Cheers,
Stephen Rothwell