From patchwork Sun Sep 10 22:10:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9946397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 629FA602C9 for ; Sun, 10 Sep 2017 22:10:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 566E128A55 for ; Sun, 10 Sep 2017 22:10:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B78A28A69; Sun, 10 Sep 2017 22:10:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86B5C28A55 for ; Sun, 10 Sep 2017 22:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751845AbdIJWKs (ORCPT ); Sun, 10 Sep 2017 18:10:48 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:58416 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdIJWKr (ORCPT ); Sun, 10 Sep 2017 18:10:47 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 6594F43E42; Mon, 11 Sep 2017 00:10:45 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id jK2MQEiw5Ge5; Mon, 11 Sep 2017 00:10:44 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 2/8] patches: brcmfmac: Fix netdev_set_priv_destructor Date: Mon, 11 Sep 2017 00:10:14 +0200 Message-Id: <20170910221020.13067-3-hauke@hauke-m.de> In-Reply-To: <20170910221020.13067-1-hauke@hauke-m.de> References: <20170910221020.13067-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On kernel > 4.11.9 the new member priv_destructor should be set in netdev_set_priv_destructor() and not the old destructor member any more, it was removed. This fixes the build on >= 4.11.9. Fixes: 7c827d5ac9c1 ("patches: brcmfmac: fix netdev destructor") Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/netdevice.h | 3 +-- patches/0079-netdev-destructor/brcmfmac.patch | 13 ++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 112bcf2b..9c912285 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -320,8 +320,7 @@ static inline void netif_trans_update(struct net_device *dev) } #endif -#if LINUX_VERSION_IS_LESS(4,12,0) && \ - !LINUX_VERSION_IN_RANGE(4,11,9, 4,12,0) +#if LINUX_VERSION_IS_LESS(4,11,9) #define netdev_set_priv_destructor(_dev, _destructor) \ (_dev)->destructor = __ ## _destructor #define netdev_set_def_destructor(_dev) \ diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch index 3f328b26..6dae7a7a 100644 --- a/patches/0079-netdev-destructor/brcmfmac.patch +++ b/patches/0079-netdev-destructor/brcmfmac.patch @@ -1,14 +1,17 @@ -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -index b5a561b..6f5466f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -462,6 +462,18 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { +@@ -462,6 +462,23 @@ static const struct net_device_ops brcmf .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; +#undef netdev_set_priv_destructor ++#if LINUX_VERSION_IS_LESS(4,11,9) +#define netdev_set_priv_destructor(_dev, _destructor) \ -+ (_dev)->destructor = _destructor ++ (_dev)->destructor = (_destructor) ++#else ++#define netdev_set_priv_destructor(_dev, _destructor) \ ++ (_dev)->priv_destructor = (_destructor) ++#endif + +#if LINUX_VERSION_IS_LESS(4,12,0) +static void __brcmf_cfg80211_free_netdev(struct net_device *ndev) @@ -21,7 +24,7 @@ index b5a561b..6f5466f 100644 int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) { struct brcmf_pub *drvr = ifp->drvr; -@@ -634,7 +646,11 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, +@@ -634,7 +651,11 @@ struct brcmf_if *brcmf_add_if(struct brc if (!ndev) return ERR_PTR(-ENOMEM);