From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541AbdFMCCO (ORCPT ); Mon, 12 Jun 2017 22:02:14 -0400 Received: from ozlabs.org ([103.22.144.67]:54789 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753362AbdFMCA2 (ORCPT ); Mon, 12 Jun 2017 22:00:28 -0400 Date: Tue, 13 Jun 2017 12:00:24 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Kalle Valo , Wireless , Linux-Next Mailing List , Linux Kernel Mailing List , Igor Mitsyanko , Dmitrii Lebed , Sergei Maksimenko , Sergey Matyukevich , Bindu Therthala , Huizhao Wang , Kamlesh Rath , Avinash Patil Subject: Re: linux-next: build failure after merge of the wireless-drivers-next tree Message-ID: <20170613120024.2a1ce31b@canb.auug.org.au> In-Reply-To: <20170608122759.7ffda0c3@canb.auug.org.au> References: <20170608122759.7ffda0c3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Dave, On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell 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 > 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 > --- > 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