From patchwork Tue May 26 17:18:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1298249 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=M0rCfHWI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Wgfr09Zcz9sSs for ; Wed, 27 May 2020 03:19:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388339AbgEZRS6 (ORCPT ); Tue, 26 May 2020 13:18:58 -0400 Received: from mail-bn8nam11on2083.outbound.protection.outlook.com ([40.107.236.83]:48578 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729597AbgEZRSw (ORCPT ); Tue, 26 May 2020 13:18:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hRzlxiSjIBzjbJDcqdmQP9dRH+PoW1Rojf0vnwguNPsygXIBJAwiao1zVbXNS4CPZvWsPb/wf2U5gkC3LL7+EJMtqw44TeMpXfwBl4k34YHUb0lRv8P5BHOOCuarv9LqoRT2N1sckWDI+Pocvc6S94NxsD5IhuDwHcdexz0eVGfyj1kiTTzYt5p4oJanE3p1fkwnTkqk3ZJMdInF0G/GJWBgkQQhEksMmKXdZC38qwjrzIvGq/VPAp+9IiS0QWbucQF3ew/RUbY2MqCdnogRj+gPvJoPYwNY4ft0IaE8lDHaeEsHOsRE5c0aedULl0s4xSX5FQaIhK5+0tbikkdryg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wsTm/QaoE2NdtXYonMZIxlYJijuapxWK1NonVnqHTHs=; b=b/YvXAiOszusnEJDFeJA0XTBug659fjBwwduJp3uNgP+q7GZGoDeCI+txCZYtlNGbrTMeNsTuEoLoaB791r4+NdmLLDKfy9fflSHe+1jF0+bnA3laEQMi4ZdDNnTfl9cQ4FTFfy4p/PvabfHAU5TV+UeqJe+wnIGABprp5DVG2Uk8UUrNqcD+PO53cI8jw8nnzmUiKH0nSJqfWb8dV0hbQIHGexG4zS0MiGfhzhxCgW0Emtzs3vIvsN/KQsf9Nrea5uhDb0tkcWPrOI2TFAUDOKZTOOHrv4Gzez6JKi9xYb6LmnrjNpslyuSMwlDbCalmlJmB4A1yJtS0HfXGwn8SA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wsTm/QaoE2NdtXYonMZIxlYJijuapxWK1NonVnqHTHs=; b=M0rCfHWIjocOTHA7QBeVvUJoGakzuEjlo0t8yMO4Q/IxKbIJmvLrNZgzGRjUFIsJZdJxp/kPIXEztmt54qTJZ0nC+fVVaFF1oxRxhvtCtzE68u6lTxnKACrYoFKwvCo9YEHnPtWj4TIWmunr83sIpMgE+e9QDE5czsGaG8daH1I= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SN6PR11MB2750.namprd11.prod.outlook.com (2603:10b6:805:54::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.25; Tue, 26 May 2020 17:18:45 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::c504:2d66:a8f7:2336]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::c504:2d66:a8f7:2336%7]) with mapi id 15.20.3021.029; Tue, 26 May 2020 17:18:45 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 03/10] staging: wfx: drop unused function wfx_pending_requeue() Date: Tue, 26 May 2020 19:18:14 +0200 Message-Id: <20200526171821.934581-4-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526171821.934581-1-Jerome.Pouiller@silabs.com> References: <20200526171821.934581-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR1PR01CA0007.eurprd01.prod.exchangelabs.com (2603:10a6:102::20) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR1PR01CA0007.eurprd01.prod.exchangelabs.com (2603:10a6:102::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17 via Frontend Transport; Tue, 26 May 2020 17:18:44 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4be2500-4ded-403c-3c7d-08d80198d8a6 X-MS-TrafficTypeDiagnostic: SN6PR11MB2750: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:88; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P9+X8Rw9PQaUKm5qJB6UNbTMhdgzF4cqSHcPjxyutkfF1OUlvCYImOhfXnkSLDXUW0HTpYojMrSYt4jjcF8wH9CVUkDPoEWID5WnYLRGFONnFYscW41DLNEORnnRf91ixGNUNFwTVuKNbMwoeVZChj2WzrCkc5zjvkuzZNrhetP/FZSLb9E/sMpJ/nFMrwBJIh8oDFznq/67Xs8mFeo7pMK6PoP1IL5pp0gUuAq1JSydAqhymXhshv9nUflsPpI6iEwO12Yh1D0XJvo3Wao4iCng1sKRIDOxV50Ntofg5Gm0IUycfrAWQQxIcEb4+XlaAMqCtnwOZpvKykI2r+ZniQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2718.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(376002)(366004)(39860400002)(136003)(346002)(4326008)(6512007)(316002)(8676002)(8936002)(2616005)(6486002)(2906002)(107886003)(1076003)(86362001)(6666004)(186003)(16526019)(5660300002)(66574014)(36756003)(54906003)(66556008)(478600001)(8886007)(6506007)(66946007)(66476007)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: RVhVY6vN1XgdfhvcDOg1A+OiGT3boOFlZZMr4FWq5WM/ObCAgZLrGDCkDXQfYxIbNubNvAC5XkQIFiPxYGGO/+f2xKM9LIlY+L6oQnXc/zhcaplEYZPhIkRP8FMSbH5fIFgGnZyZMF00TZJ1keHGEGLXGbI0exA07+o9uHGt9JPbMSLksqk6d4X/2fJnWJ1kAHvbxpNJ+kksQzHl4pDWvpnoDmhMBYGjzG5heUpzAkMePzEe8vLOUcAvT7isgel5eYs6o6CDLgkl4v628l6rub9JuT5VTMx7k9nQyCwKDqQs1tziOeYd4wgPgeKfKQaxsQZ+wDkvsWl6BF5mwikM78xj8JnkYY1rFztU5vTx0Otiled+/R8g0a/W6w8BYlOSk+s9Z6O4xWqRZDkKR25I3w9Zj1AnclkMgxCMLCU+hrXxte+IiASI50pjWxXRn5TvRM9Dr7I+UARRJSqve78QEk6HkDywYWf8QW7gKcAa18pMwJrcnYAVAddbaOq5Iizdr9UIc99szB3kq1QP6AbqOWm0C8FrK8lWfpPpzNXCSt4= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4be2500-4ded-403c-3c7d-08d80198d8a6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:18:45.5714 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UeXzHJ1/cVppIMF4u4GdrWQbQ05ftf5CeoPF+9bUwcnA8FS2VySWFH2wpLVXXOIKMxsFN7N8Py0HEA76f0bWbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2750 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The function wfx_pending_requeue() is not used anymore since the commit 7a44644c9379e ("staging: wfx: introduce wfx_set_default_unicast_key()") Fixes: 7a44644c9379e ("staging: wfx: introduce wfx_set_default_unicast_key()") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 13 ------------- drivers/staging/wfx/queue.h | 1 - 2 files changed, 14 deletions(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 26b141cbd3035..3248ecefda564 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -143,19 +143,6 @@ void wfx_tx_queues_put(struct wfx_dev *wdev, struct sk_buff *skb) skb_queue_tail(&queue->normal, skb); } -int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb) -{ - struct wfx_queue *queue = &wdev->tx_queue[skb_get_queue_mapping(skb)]; - - WARN_ON(skb_get_queue_mapping(skb) > 3); - WARN_ON(!atomic_read(&queue->pending_frames)); - - atomic_dec(&queue->pending_frames); - skb_unlink(skb, &wdev->tx_pending); - wfx_tx_queues_put(wdev, skb); - return 0; -} - void wfx_pending_drop(struct wfx_dev *wdev, struct sk_buff_head *dropped) { struct wfx_queue *queue; diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index 0cbe5f4b06f24..0c3b7244498e3 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -38,7 +38,6 @@ void wfx_tx_queue_drop(struct wfx_dev *wdev, struct wfx_queue *queue, struct sk_buff *wfx_pending_get(struct wfx_dev *wdev, u32 packet_id); void wfx_pending_drop(struct wfx_dev *wdev, struct sk_buff_head *dropped); -int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb); unsigned int wfx_pending_get_pkt_us_delay(struct wfx_dev *wdev, struct sk_buff *skb); void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms);