From patchwork Wed Jan 15 13:55:34 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: 1223511 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=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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=RC7hyhuC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47yTQQ42Kqz9sR0 for ; Thu, 16 Jan 2020 00:56:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730378AbgAON4o (ORCPT ); Wed, 15 Jan 2020 08:56:44 -0500 Received: from mail-eopbgr770085.outbound.protection.outlook.com ([40.107.77.85]:39089 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729188AbgAON4l (ORCPT ); Wed, 15 Jan 2020 08:56:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OzlNZiARSrQ3/XJ/QguW9s8pdSSCmdvZix2jKWkt4mEUdWtfjmM/RHoylDSXSrYWnP9phLANSL+ozLczbAxh9hsTk8L6WzBkvJpHSTjHW0PBVMxvb0jYRPHKp869HDDfB2kSplrUDIXB1785qN6r5wjOPzJHS7kD3mUI6/uhcyvwihCpN6z2tkWI5MhzD/7Ptd4udWSsMuQ7sAJEaU6Y7vgfJ2xaU6U/CIyr+DbU6idFtMzdIfIMdnX53i74zLGBanqlyB4CGQR/MME0u03qeAVC1trQ5XjnKQycIbCXTGJTAuTYJwbco/LFs7aSpUAp4ijEliHXnsQM/r6vvaJfLg== 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=BRdkCaupn/fgxCt3IoUfgFaos2qDQtkFasABJ9hW8nY=; b=BQty+pHhzzFu8bArU1iMSYReds4bOVvY4RpSqGNrrXmY/MSj3roUBbcVSiHgw6ExCMXObCnIhIIaepbbxGQOWP/8K+Ydh9FQGhbIx7EKx7TdPBJUZIeJB+JEelgSHbC1bsVCKjAg8W+t4aVH+q9y+S6JF2MDKiYQx7Fmg1RBC5PlvIm8gAgYJEnJjFLjZ2pWzNP5P9tLprObCrUsowjyrI2hwu+4bNzarDpKeMSF7GlTU8qdY08eZTZsYC1eCCftrbMtC6iJgepDFc1MDd5NddLUfUbTscyXBb9mIZDxtHtUyjJFPhgyT9jKUlNT9u+sCBauTQ0JYkQ+5Wz3EHq39Q== 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=BRdkCaupn/fgxCt3IoUfgFaos2qDQtkFasABJ9hW8nY=; b=RC7hyhuCpVtJXsbXcAfDN7+jRDNoRQlq+/BQ+Hh26ioYvhK43R5a/l9zqXo6ymyCvmPkXzKMV59OsvLlJnKE4zaU5c/ddVHt7Pg3Epy7z1qfsENwNTIhqcrzsxUFZoPqzEFK12TA2iIfU6vmNFVpQV5cYzFNTqATxjTUVjqWZPw= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB3661.namprd11.prod.outlook.com (20.178.252.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18; Wed, 15 Jan 2020 13:56:04 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf%4]) with mapi id 15.20.2623.018; Wed, 15 Jan 2020 13:56:04 +0000 Received: from pc-42.home (2a01:e35:8bf5:66a0:3dbe:4cb5:6059:a948) by PR2P264CA0008.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Wed, 15 Jan 2020 13:55:32 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= 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?SsOpcsO0bWUgUG91?= =?utf-8?q?iller?= Subject: [PATCH v2 62/65] staging: wfx: simplify hif_handle_tx_data() Thread-Topic: [PATCH v2 62/65] staging: wfx: simplify hif_handle_tx_data() Thread-Index: AQHVy6t1fM9uRY43K0qjcItg1sJYRA== Date: Wed, 15 Jan 2020 13:55:34 +0000 Message-ID: <20200115135338.14374-63-Jerome.Pouiller@silabs.com> References: <20200115135338.14374-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20200115135338.14374-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR2P264CA0008.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::20) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.25.0 x-originating-ip: [2a01:e35:8bf5:66a0:3dbe:4cb5:6059:a948] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 00be0011-824e-4982-af09-08d799c29778 x-ms-traffictypediagnostic: MN2PR11MB3661: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-forefront-prvs: 02830F0362 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(396003)(136003)(346002)(366004)(199004)(189003)(8886007)(6486002)(316002)(54906003)(71200400001)(36756003)(6506007)(66476007)(66446008)(66946007)(110136005)(8676002)(81166006)(81156014)(478600001)(86362001)(2616005)(4326008)(66574012)(2906002)(107886003)(1076003)(16526019)(186003)(85202003)(5660300002)(6512007)(52116002)(64756008)(66556008)(85182001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB3661; H:MN2PR11MB4063.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pN+6WZ5XbgNQ8qsv0V6PHNDvqR3BSEvo0NpEDK3FYkjWvRjS4F8uKlZG2zHf4pJmWgAyv5pqM3JsP39sm/8lITKUSc5j7nL4AqRQ88Ude+3EPkmh1Ab5nY9o9TjkkApusoYORAPsNhXW38Fs02fkfjOkRyC4XNk2QhC3ryf3lLKaxrwEoaImmn3/hU4YuD8FEvCqx/0znWOyek1zHJzQ8P/azJngYNkWtUh+UFLftBjcTwpblTyuLJNHUmk+st7an90x4g/faBOoQxataHlXhmwe5ALQuzgCLRoDldQ9pCv2Jgf7NPmRh2qIYQpt2gxcwNi1RloiKdVyi0PztsHStXX8jDbuFwDviIkLSt9NVJSuVGiJpUZFpcgEBKQSRbT/QkY4UBr+TC1u7gYaupjGHsjQqpg9klk6FZ8UH2n0bR4BxgwqBG79CsDC+7ad+1wY Content-ID: <22F370444182744D8E8257C9732B923A@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00be0011-824e-4982-af09-08d799c29778 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 13:55:34.2227 (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: aaq1wQXewbO34/K1BQ2TeWIdbGufcpPLXuf8NE4fz0LWv+6YUryAPE9QV7qb1rGfm2JdCVfUI+TIdg1qD+XhTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3661 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Since enum action has now only two cases, it can be dropped. Then hif_handle_tx_data() can be simplified. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 40 ++++++++++++++----------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index e0c609c35a7b..024497eb19ac 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -359,16 +359,13 @@ bool wfx_tx_queues_is_empty(struct wfx_dev *wdev) static bool hif_handle_tx_data(struct wfx_vif *wvif, struct sk_buff *skb, struct wfx_queue *queue) { - bool handled = false; - struct wfx_tx_priv *tx_priv = wfx_skb_tx_priv(skb); struct hif_req_tx *req = wfx_skb_txreq(skb); - struct ieee80211_hdr *frame = (struct ieee80211_hdr *) (req->frame + req->data_flags.fc_offset); - - enum { - do_wep, - do_tx, - } action = do_tx; + struct ieee80211_key_conf *hw_key = wfx_skb_tx_priv(skb)->hw_key; + struct ieee80211_hdr *frame = + (struct ieee80211_hdr *)(req->frame + req->data_flags.fc_offset); + // FIXME: mac80211 is smart enough to handle BSS loss. Driver should not + // try to do anything about that. if (ieee80211_is_nullfunc(frame->frame_control)) { mutex_lock(&wvif->bss_loss_lock); if (wvif->bss_loss_state) { @@ -376,31 +373,24 @@ static bool hif_handle_tx_data(struct wfx_vif *wvif, struct sk_buff *skb, req->queue_id.queue_id = HIF_QUEUE_ID_VOICE; } mutex_unlock(&wvif->bss_loss_lock); - } else if (ieee80211_has_protected(frame->frame_control) && - tx_priv->hw_key && - tx_priv->hw_key->keyidx != wvif->wep_default_key_id && - (tx_priv->hw_key->cipher == WLAN_CIPHER_SUITE_WEP40 || - tx_priv->hw_key->cipher == WLAN_CIPHER_SUITE_WEP104)) { - action = do_wep; } - switch (action) { - case do_wep: + // FIXME: identify the exact scenario matched by this condition. Does it + // happen yet? + if (ieee80211_has_protected(frame->frame_control) && + hw_key && hw_key->keyidx != wvif->wep_default_key_id && + (hw_key->cipher == WLAN_CIPHER_SUITE_WEP40 || + hw_key->cipher == WLAN_CIPHER_SUITE_WEP104)) { wfx_tx_lock(wvif->wdev); WARN_ON(wvif->wep_pending_skb); - wvif->wep_default_key_id = tx_priv->hw_key->keyidx; + wvif->wep_default_key_id = hw_key->keyidx; wvif->wep_pending_skb = skb; if (!schedule_work(&wvif->wep_key_work)) wfx_tx_unlock(wvif->wdev); - handled = true; - break; - case do_tx: - break; - default: - /* Do nothing */ - break; + return true; + } else { + return false; } - return handled; } static int wfx_get_prio_queue(struct wfx_vif *wvif,