From patchwork Tue Apr 4 06:18:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96692 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48381qgd; Mon, 3 Apr 2017 23:18:45 -0700 (PDT) X-Received: by 10.98.137.204 with SMTP id n73mr20654643pfk.5.1491286725524; Mon, 03 Apr 2017 23:18:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.45; Mon, 03 Apr 2017 23:18:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbdDDGSo (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:44 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33566 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbdDDGSo (ORCPT ); Tue, 4 Apr 2017 02:18:44 -0400 Received: by mail-pg0-f48.google.com with SMTP id x125so142570309pgb.0 for ; Mon, 03 Apr 2017 23:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=a46raFf00Jgf4GPCm7LLS/nxscm6Rt2G0jAHA8WTtOkbTsgdOyGqIr3Q2jvMSbONPL dTwDFSoo3G7k/PGVWHr/uHQPlitgcQgIdNxkr0HNlZjFumYN6aN99F6LnAlpgzQXXP7r 5aphmJ6+fhx4J7/1op5aqV6O2ctJJLB/kfMOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ywNRqkJhRIcGlFeuSPdwGRnCGuD6T4EbwBekAg8Sfrs=; b=rNN71yD42v0T9kuj51Zb6qVL/4mov7pS+doRNxRuV6qkFGS5C3qUr5B8Rtk3TVYOlu bz84xuHHdx6Gjk3RIlNcLBtGU4SiIDhBwI7H07pKB0VctXGrc35j3Uq0wCq3kcdJMvAx 4geTRbl5j9hd2O9cA4pc0bSh7GQnVzA4KH7eyc+DfbfUtdEbmU9z80cznGRKqyWsLmnZ RzI5+U9G/zZjDrcI4F+XDg8b6NLIDMZeqNftzRe7KNcQX1jD/zXUN7E7Vzq0YX7CBTDC EyM+TRSMhym7BPrcdQ3D8/110Ay0QLHVATSDmfMXtRJFMH93POE0OVP/j8xvGMnmCjhS rjOA== X-Gm-Message-State: AFeK/H1iQdoXOGmtvdO3jj+HWcfNOd46WxnItv+GueSRGJVFfMvKEhsd+Sw0fsUThON60EXo X-Received: by 10.84.149.168 with SMTP id m37mr26895709pla.97.1491286723642; Mon, 03 Apr 2017 23:18:43 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y70sm29190878pfa.96.2017.04.03.23.18.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:42 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Stanislaw Gruszka , Vishal Thanki , Kalle Valo Subject: [PATCH 30/33] rt2x00usb: fix anchor initialization Date: Tue, 4 Apr 2017 11:48:36 +0530 Message-Id: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanislaw Gruszka If device fail to initialize we can OOPS in rt2x00lib_remove_dev(), due to using uninitialized usb_anchor structure: [ 855.435820] ieee80211 phy3: rt2x00usb_vendor_request: Error - Vendor Request 0x07 failed for offset 0x1000 with error -19 [ 855.435826] ieee80211 phy3: rt2800_probe_rt: Error - Invalid RT chipset 0x0000, rev 0000 detected [ 855.435829] ieee80211 phy3: rt2x00lib_probe_dev: Error - Failed to allocate device [ 855.435845] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 [ 855.435900] IP: _raw_spin_lock_irq+0xd/0x30 [ 855.435926] PGD 0 [ 855.435953] Oops: 0002 [#1] SMP [ 855.437011] Call Trace: [ 855.437029] ? usb_kill_anchored_urbs+0x27/0xc0 [ 855.437061] rt2x00lib_remove_dev+0x190/0x1c0 [rt2x00lib] [ 855.437097] rt2x00lib_probe_dev+0x246/0x7a0 [rt2x00lib] [ 855.437149] ? ieee80211_roc_setup+0x9e/0xd0 [mac80211] [ 855.437183] ? __kmalloc+0x1af/0x1f0 [ 855.437207] ? rt2x00usb_probe+0x13d/0xc50 [rt2x00usb] [ 855.437240] rt2x00usb_probe+0x155/0xc50 [rt2x00usb] [ 855.437273] rt2800usb_probe+0x15/0x20 [rt2800usb] [ 855.437304] usb_probe_interface+0x159/0x2d0 [ 855.437333] driver_probe_device+0x2bb/0x460 Patch changes initialization sequence to fix the problem. Cc: Vishal Thanki Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Stanislaw Gruszka Signed-off-by: Kalle Valo (cherry picked from commit 0488a6121dfe6cbd44de15ea3627913b7549a1e9) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index efe2501..662705e 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -820,10 +820,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, if (retval) goto exit_free_device; - retval = rt2x00lib_probe_dev(rt2x00dev); - if (retval) - goto exit_free_reg; - rt2x00dev->anchor = devm_kmalloc(&usb_dev->dev, sizeof(struct usb_anchor), GFP_KERNEL); @@ -831,10 +827,17 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, retval = -ENOMEM; goto exit_free_reg; } - init_usb_anchor(rt2x00dev->anchor); + + retval = rt2x00lib_probe_dev(rt2x00dev); + if (retval) + goto exit_free_anchor; + return 0; +exit_free_anchor: + usb_kill_anchored_urbs(rt2x00dev->anchor); + exit_free_reg: rt2x00usb_free_reg(rt2x00dev); From patchwork Tue Apr 4 06:18:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96693 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48391qgd; Mon, 3 Apr 2017 23:18:47 -0700 (PDT) X-Received: by 10.98.204.25 with SMTP id a25mr21178567pfg.6.1491286727723; Mon, 03 Apr 2017 23:18:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.47; Mon, 03 Apr 2017 23:18:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbdDDGSr (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:47 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:33580 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbdDDGSq (ORCPT ); Tue, 4 Apr 2017 02:18:46 -0400 Received: by mail-pg0-f45.google.com with SMTP id x125so142571083pgb.0 for ; Mon, 03 Apr 2017 23:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wx1vHvIgNYKWT5D1ylzbYtfsrrBH7Yk1egsYxj7/3bw=; b=MSkFZZ+BeC8FScSBjo2zC0wTSg0qfbd8++Y3K9QEe9lpa+m3XguDDUVlZEX2nyt+vr SYQrqNSoNJoIrswJxGmix2VxzUGSvmYmSpODaBx70KsVOP9Dfm6howAZzfB39s0CVvh+ OKP24TVKJUVE/vFX5mMAAK128Pm0SGtC2bPEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Wx1vHvIgNYKWT5D1ylzbYtfsrrBH7Yk1egsYxj7/3bw=; b=M08KLTuThhkSbsE6A3UGFTcsrYcQsqktfeg2LnIgm1i9V6apQoPVWZ39cZQSF5Je0Y IQi61d0t8cgMjk0feRF+0tEpyKXCnzI5Z+Ax9xhyJjA2cA+0pqnH5X14mpd4RhwbjIAL +a5NwuYgZ5VZYxGxorwevjht8jjG9fKkHFoGn5D0z9oObA3ggbP7u+Q0pCbsLPxzo17n MojTZDTwEQ0uWjOEPYF2B7RsAbwch1WauA+yH1EhOD4SHCf3sDJmdLjJZLa4CBKRqkn3 00LKGWxgiRC1IU5uW9DX9C3Zmfy6tNOgFRGHJP6M1JKPm0LBe9saHHMO5X8oHILgDDsU Q4bg== X-Gm-Message-State: AFeK/H1l/m+i7mf3qEDpf6w4CJIaB3O029+hzl32CrTnYZW5vREXyRu6Uij6+uajEBZsCLON X-Received: by 10.98.52.5 with SMTP id b5mr21406000pfa.206.1491286725709; Mon, 03 Apr 2017 23:18:45 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y70sm29190878pfa.96.2017.04.03.23.18.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:45 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Tobias Klauser , Kalle Valo Subject: [PATCH 31/33] brcmfmac: Use net_device_stats from struct net_device Date: Tue, 4 Apr 2017 11:48:37 +0530 Message-Id: <1491286719-31388-2-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> References: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tobias Klauser Instead of using a private copy of struct net_device_stats in struct brcm_if, use stats from struct net_device. Also remove the now unnecessary .ndo_get_stats function. Signed-off-by: Tobias Klauser Acked-by: Arend van Spriel Signed-off-by: Kalle Valo (cherry picked from commit 91b632803ee4e47c5a5c4dc3d8bf5abf9c16107a) Signed-off-by: Amit Pundir --- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 26 +++++++--------------- .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 -- 2 files changed, 8 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 5eaac13..cf1ae5a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -243,10 +243,10 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, done: if (ret) { - ifp->stats.tx_dropped++; + ndev->stats.tx_dropped++; } else { - ifp->stats.tx_packets++; - ifp->stats.tx_bytes += skb->len; + ndev->stats.tx_packets++; + ndev->stats.tx_bytes += skb->len; } /* Return ok: we always eat the packet */ @@ -290,15 +290,15 @@ void brcmf_txflowblock(struct device *dev, bool state) void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb) { if (skb->pkt_type == PACKET_MULTICAST) - ifp->stats.multicast++; + ifp->ndev->stats.multicast++; if (!(ifp->ndev->flags & IFF_UP)) { brcmu_pkt_buf_free_skb(skb); return; } - ifp->stats.rx_bytes += skb->len; - ifp->stats.rx_packets++; + ifp->ndev->stats.rx_bytes += skb->len; + ifp->ndev->stats.rx_packets++; brcmf_dbg(DATA, "rx proto=0x%X\n", ntohs(skb->protocol)); if (in_interrupt()) @@ -321,7 +321,7 @@ static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb, if (ret || !(*ifp) || !(*ifp)->ndev) { if (ret != -ENODATA && *ifp) - (*ifp)->stats.rx_errors++; + (*ifp)->ndev->stats.rx_errors++; brcmu_pkt_buf_free_skb(skb); return -ENODATA; } @@ -382,7 +382,7 @@ void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success) } if (!success) - ifp->stats.tx_errors++; + ifp->ndev->stats.tx_errors++; brcmu_pkt_buf_free_skb(txp); } @@ -405,15 +405,6 @@ void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success) } } -static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev) -{ - struct brcmf_if *ifp = netdev_priv(ndev); - - brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx); - - return &ifp->stats; -} - static void brcmf_ethtool_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info) { @@ -486,7 +477,6 @@ static int brcmf_netdev_open(struct net_device *ndev) static const struct net_device_ops brcmf_netdev_ops_pri = { .ndo_open = brcmf_netdev_open, .ndo_stop = brcmf_netdev_stop, - .ndo_get_stats = brcmf_netdev_get_stats, .ndo_start_xmit = brcmf_netdev_start_xmit, .ndo_set_mac_address = brcmf_netdev_set_mac_address, .ndo_set_rx_mode = brcmf_netdev_set_multicast_list diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h index c94dcab..397c912 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h @@ -171,7 +171,6 @@ enum brcmf_netif_stop_reason { * @drvr: points to device related information. * @vif: points to cfg80211 specific interface information. * @ndev: associated network device. - * @stats: interface specific network statistics. * @multicast_work: worker object for multicast provisioning. * @ndoffload_work: worker object for neighbor discovery offload configuration. * @fws_desc: interface specific firmware-signalling descriptor. @@ -187,7 +186,6 @@ struct brcmf_if { struct brcmf_pub *drvr; struct brcmf_cfg80211_vif *vif; struct net_device *ndev; - struct net_device_stats stats; struct work_struct multicast_work; struct work_struct ndoffload_work; struct brcmf_fws_mac_descriptor *fws_desc; From patchwork Tue Apr 4 06:18:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96694 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48406qgd; Mon, 3 Apr 2017 23:18:49 -0700 (PDT) X-Received: by 10.98.204.25 with SMTP id a25mr21178674pfg.6.1491286729632; Mon, 03 Apr 2017 23:18:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.49; Mon, 03 Apr 2017 23:18:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498AbdDDGSt (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:49 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:36270 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbdDDGSs (ORCPT ); Tue, 4 Apr 2017 02:18:48 -0400 Received: by mail-pg0-f53.google.com with SMTP id g2so140824193pge.3 for ; Mon, 03 Apr 2017 23:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pL8UdHid6fe21wcMh+Y6hAW8vWBXpxHPy2fOfxMRqwQ=; b=fGCMUjCgrbjM/n2kOUFp59BZQZY+S027Lai6cmh9V5IHAhUaGdXTO1TpcIc1Rjddbn jzlx449Bo5IPLYAj3tv5s4KrV0rAYSdkWXdc+wsYmJXgFnWjQejrFhMGsOgdvUCen+uS Dqhsj81gTtKVIsK4FP2Waxy/dcbOCtdKVZHoA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pL8UdHid6fe21wcMh+Y6hAW8vWBXpxHPy2fOfxMRqwQ=; b=LEDYKcAuWq58gNwFVheDKGfhzoSfRDxsGk5evaWFxht60xMhHIQ6qNfc5QE7YQnEhj e8Mw57fcxtFCRfyuGsZIBhpcR6vh7hX/xXuFLC0zbgTCyrralmSR8MhyaoCdNAJOKvFo WWc9UBtMmzFlChPDc4ieQuYEvQf2gkniQF+W2CbstQNf7PoliCpgIAam3Sm66b6zDh0G 4X2GbslBEHdYJfvQ+re9gl4WHDi/8tPzR+DYhtohmbJfNnoK+H7dEOuXAiJq+NvU9fF1 yL7KBwg/UAFxBD7YyjXuD8QlN7mfl1/tKbV14vtbQA+5Sdgt/epxPhujehLWFNRTW2tq SiOg== X-Gm-Message-State: AFeK/H2NC4scsGNs7TxczN++EFEmBBkJaK54GsbBwqlVGl3nBJ9S2bEyS5kFioSNa73qzOSR X-Received: by 10.98.138.206 with SMTP id o75mr341615pfk.128.1491286727709; Mon, 03 Apr 2017 23:18:47 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y70sm29190878pfa.96.2017.04.03.23.18.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:47 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Vishal Thanki , Kalle Valo Subject: [PATCH 32/33] rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB Date: Tue, 4 Apr 2017 11:48:38 +0530 Message-Id: <1491286719-31388-3-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> References: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vishal Thanki In device removal routine, usage of "#ifdef CONFIG_RT2X00_LIB_USB" will not cover the case when it is configured as module. This will omit the entire if-block which does cleanup of URBs and cancellation of pending work. Changing the #ifdef to #if IS_ENABLED() to fix it. Signed-off-by: Vishal Thanki Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo (cherry picked from commit a083c8fd277b4122c804f18ec8c84165f345c71c) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index 4e0c565..b7273be 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1422,7 +1422,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); -#ifdef CONFIG_RT2X00_LIB_USB +#if IS_ENABLED(CONFIG_RT2X00_LIB_USB) if (rt2x00_is_usb(rt2x00dev)) { usb_kill_anchored_urbs(rt2x00dev->anchor); hrtimer_cancel(&rt2x00dev->txstatus_timer); From patchwork Tue Apr 4 06:18:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96695 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48415qgd; Mon, 3 Apr 2017 23:18:52 -0700 (PDT) X-Received: by 10.98.156.203 with SMTP id u72mr21487122pfk.127.1491286732010; Mon, 03 Apr 2017 23:18:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.51; Mon, 03 Apr 2017 23:18:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752556AbdDDGSv (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:51 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:34045 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbdDDGSu (ORCPT ); Tue, 4 Apr 2017 02:18:50 -0400 Received: by mail-pg0-f51.google.com with SMTP id 21so142776975pgg.1 for ; Mon, 03 Apr 2017 23:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iuPu4lRlMjUFwZ+IXyUm+27S2ChXPG77SFpGXF94I7c=; b=TooHTPT+Jj/K33Ku7ZWPyvZaqTObQLDtIPx6R4e7tmHCBA0SKyD4hrIRP6o/VgOw2l o/VcbR3UmOp+j9dl0xQmwfLJT4Zmjdr9k00UXEHYy10dzuiwVnbZYOrMGTYXzzqrM6j9 7CzuXk2ietAKvrsxpcozvBFm/rAGDREN+GUA8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iuPu4lRlMjUFwZ+IXyUm+27S2ChXPG77SFpGXF94I7c=; b=CHsipMMUDNkV9lVs+2QUJBqsoe8ACf5Axrskl7NY+1+6TZ8+h5Vx/INj1yMR5OlI99 nevcQx0warIjhsYgsrsNbs/LGkKmO8nwpr0lnJx3IO9MoK25wN7i3a8TCG7wslEK5df4 VRcCJjPbQnvvVsJWVNodS6fdL4tdJr1/hDqwX35gmFEpevFcUHmS87aCDkccBPZXmGcl KIlSnA8JP8vooL2Ejt35z2yT+h5khzbcvB3NXRoW46eqElYbDIRu01ElLfy6K1/WFQSO 6blk8rNf6KFMfLVKmOTRwPuEy7yas1HytRELGU8rC7RD5s4UhP97SC31Y7mNrnhzvb1a VyZA== X-Gm-Message-State: AFeK/H2YZkEnrATLVsDZcVJ9/hvpGRzgw/SCProb+cCyJx5oNVk8ki0VRQYFe7QCBqLosy51 X-Received: by 10.98.0.66 with SMTP id 63mr20799561pfa.145.1491286730067; Mon, 03 Apr 2017 23:18:50 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y70sm29190878pfa.96.2017.04.03.23.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:49 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Stanislaw Gruszka , Vishal Thanki , Kalle Valo Subject: [PATCH 33/33] rt2x00: avoid introducing a USB dependency in the rt2x00lib module Date: Tue, 4 Apr 2017 11:48:39 +0530 Message-Id: <1491286719-31388-4-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> References: <1491286719-31388-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanislaw Gruszka As reported by Felix: Though protected by an ifdef, introducing an usb symbol dependency in the rt2x00lib module is a major inconvenience for distributions that package kernel modules split into individual packages. Get rid of this unnecessary dependency by calling the usb related function from a more suitable place. Cc: Vishal Thanki Reported-by: Felix Fietkau Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Stanislaw Gruszka Signed-off-by: Kalle Valo (cherry picked from commit 6232c17438ed01f43665197db5a98a4a4f77ef47) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 23 ++++++++--------------- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 5 +++++ 2 files changed, 13 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index b7273be..c8d9075 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1422,21 +1422,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); -#if IS_ENABLED(CONFIG_RT2X00_LIB_USB) - if (rt2x00_is_usb(rt2x00dev)) { - usb_kill_anchored_urbs(rt2x00dev->anchor); - hrtimer_cancel(&rt2x00dev->txstatus_timer); - cancel_work_sync(&rt2x00dev->rxdone_work); - cancel_work_sync(&rt2x00dev->txdone_work); - } -#endif - if (rt2x00dev->workqueue) - destroy_workqueue(rt2x00dev->workqueue); - - /* - * Free the tx status fifo. - */ - kfifo_free(&rt2x00dev->txstatus_fifo); /* * Kill the tx status tasklet. @@ -1452,6 +1437,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) */ rt2x00lib_uninitialize(rt2x00dev); + if (rt2x00dev->workqueue) + destroy_workqueue(rt2x00dev->workqueue); + + /* + * Free the tx status fifo. + */ + kfifo_free(&rt2x00dev->txstatus_fifo); + /* * Free extra components */ diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index 662705e..631df69 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -740,6 +740,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev) { struct data_queue *queue; + usb_kill_anchored_urbs(rt2x00dev->anchor); + hrtimer_cancel(&rt2x00dev->txstatus_timer); + cancel_work_sync(&rt2x00dev->rxdone_work); + cancel_work_sync(&rt2x00dev->txdone_work); + queue_for_each(rt2x00dev, queue) rt2x00usb_free_entries(queue); }