From patchwork Tue Aug 25 08:58:23 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: 261976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, RCVD_ILLEGAL_IP, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1ABEC433E3 for ; Tue, 25 Aug 2020 08:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A19D52068F for ; Tue, 25 Aug 2020 08:59:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Q5Ta75Ig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729665AbgHYI7e (ORCPT ); Tue, 25 Aug 2020 04:59:34 -0400 Received: from mail-dm6nam12on2052.outbound.protection.outlook.com ([40.107.243.52]:53959 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729625AbgHYI70 (ORCPT ); Tue, 25 Aug 2020 04:59:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P133iMKGyBAAGSzjVKpJWuNJfRNlnUCZzxCZr50dqmBuJjVylxhKP6U51OLf2uEqkvNngGQUv0PvbZ3MTgKx/wjsYg7KD0qJH5GwtUlTaGIErqLkos0JcPPpMBi36SfR8eHrYV/0k4MSdB82cJ4cM8f99keKqYfOwyhsZyQiTn+dBvpWS5LwTSwWVhdDm+kvSQrgoMkJtjRjhji3NOG1aa3IDXEIj6ON0CpM26sAGyFBd0NONBmcfS8L/zu7U3RY6qQOx5mwwS8Q/NP9XFrvV7grdLOORDjqDQYWawhp3crSP+VOQdumAIPmTGXdCuY3cVWMistnnEP7fx7OMsQfKQ== 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=ak4CIZP3dcXMGBZZ3ut14GrlVvZym3fnk37czMeMAyQ=; b=L2I793BUaPgLE6TlK32IlhUVc/3WuooDAvMUYdAxzl+NLaIBvlMOaDDxVXN1OYdjHWHlNdmPRFy5Hw2i/gApRsCsXcVHL/kZYR0AH24Ig+1TEpz4RCdvUu8tcLabWxTECmprBfaZixVJYl2mXJXd5kifcr9iPb3wtSzuobEy6Q467VAtheAF2M9zk0fPZaGZHbHk361fs8uTJmFmOO220nGeDlVPqBDfi3aRyaNqqC+gOXXnU6fLIUDpcmHKkgYP1h8OnFrYnXcNehvTDOYpPvm4SnFfyT0jdAcoDc6CGHKVf/c0d6PPftA3q8W2nD78X3m8Nnn77ArsQ9bg4Mz2tQ== 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=ak4CIZP3dcXMGBZZ3ut14GrlVvZym3fnk37czMeMAyQ=; b=Q5Ta75IgwuVQ+ggtrjFMPnCf9lmCTqSrAOq3M89X/9dy8c6KpdCk2qvr0Ppl3W/kYAjZA2lfhrmdGgarrSRUsCPejhyjR0yKi0qEwmCYGZRsJNSDJJx9UE9kYqg5AsJGbUX1P95cD0oYfV5JkfCez/L8lgwx5pzQU38lUzU6P6c= 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 SN6PR11MB3501.namprd11.prod.outlook.com (2603:10b6:805:d4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.26; Tue, 25 Aug 2020 08:59:05 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6%4]) with mapi id 15.20.3305.026; Tue, 25 Aug 2020 08:59:05 +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 v2 07/12] staging: wfx: fix frame reordering Date: Tue, 25 Aug 2020 10:58:23 +0200 Message-Id: <20200825085828.399505-7-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825085828.399505-1-Jerome.Pouiller@silabs.com> References: <20200825085828.399505-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::7) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by PR3P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Tue, 25 Aug 2020 08:59:03 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [37.71.187.125] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 685e85d7-6b4e-4dff-a041-08d848d51e67 X-MS-TrafficTypeDiagnostic: SN6PR11MB3501: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5grI8A8nErTT8v+2rGva5D4u9oNlxTz1oH52QZzsMZSWEodEnAMPx7NKkzgtmGy1Um7U/QfLTPcE1xAHWhgRqMU162dgqTtQ4ptBExC50KyLFmo33WQvui+TbUwbxe7na1z0NcSAx8ert+nSrEFdmqqE70ZFOoKp5zeogv533Di2GdCRpxRMp/mc6CcPrdiBKb9fM9B8cYEnCHC6soBeYqwFK3gbqIC0lr9Mj6ULs9XO1DjUE+eonVfgNS1I1JOBcumcT+9YLSkyehibV50xSVwiXcL/8/0wFr5KLHloY58vraFJC87ly5YrVTKK+QYE 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; SFS:(136003)(39830400003)(396003)(346002)(376002)(366004)(316002)(5660300002)(478600001)(107886003)(1076003)(8936002)(83380400001)(16576012)(956004)(66556008)(66476007)(26005)(2616005)(186003)(8676002)(86362001)(66946007)(6486002)(54906003)(6666004)(36756003)(4326008)(66574015)(2906002)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HEX90+GxvWi+q6E3CLX7aTrARVmx4U2sZHF/2NaorXVCZ1GYfqq6Qo4ShLt5grKwtVHzePvL0GlXFKq/L2eUTJoIL0iayXWH/MwoygtVtdrgzUdKbQDQuT+iRcMwSeoraX8I2n3wwYapar5QVpeVj+n7ECvoTt+Bvtll3YC8ge+MLCJqAgSQT5J3avW4uwhUL03FH9Z6oS4GgvCF+jK1XPcL6bRNkosW+CVGJQshEzad8uXTtM5iH4CAz/iKTak8b8efyEWKxZwKiUDZ4NePa0ia+QH2g6WsbRM1gepGGbpt3RVlax9FV7LPhb9DEO5QvUlFXLSQHqaPmy4iyt8KRU4/ej3mH6VmnG9nKwqTxEqD8tsJ/DxchJux/hx+rZ8sQD84uvU4bthSrMHawR30jvETWrlCTWmNW8OrVOY8pk06f3UyEgxIXrnF76n+SjKyASUi56x1XbVbcBtOIhStID63cv42wJf3v+qjPQBrw1wk/MwLJG8mvYgPhJGS/vAHShpyg5TuiujrpYI9VLiByIrLKIrk9y3QL0L7+Xg06RUQt/DXYnF2G76D57/2zyLNW73aH1CebGQNT90xRqERvJG0+sfDLUIIQ+qYAHa1lhnw5j5udqvlKSYBjjQZA1lwJtLIed/jTTGUuvxOKttpPw== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 685e85d7-6b4e-4dff-a041-08d848d51e67 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2020 08:59:05.1085 (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: gWY9Cj0sDgrWvz1gNnX5P08csWHUAvZVnz0j+wPWzIZoiWwe6XYFZOGpvo/Fcjx8A8gl4DjY9CBrR/XsPVMOYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3501 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller When mac80211 debug is enabled, the trace below appears: [60744.340037] wlan0: Rx A-MPDU request on aa:bb:cc:97:60:24 tid 0 result -524 This imply that ___ieee80211_start_rx_ba_session will prematurely exit and frame reordering won't be enabled. Fixes: e5da5fbd77411 ("staging: wfx: fix CCMP/TKIP replay protection") Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 2b848b8985df..7a4c9f63c4a2 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -680,15 +680,16 @@ int wfx_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_ampdu_params *params) { - /* Aggregation is implemented fully in firmware, - * including block ack negotiation. Do not allow - * mac80211 stack to do anything: it interferes with - * the firmware. - */ - - /* Note that we still need this function stubbed. */ - - return -ENOTSUPP; + // Aggregation is implemented fully in firmware + switch (params->action) { + case IEEE80211_AMPDU_RX_START: + case IEEE80211_AMPDU_RX_STOP: + // Just acknowledge it to enable frame re-ordering + return 0; + default: + // Leave the firmware doing its business for tx aggregation + return -ENOTSUPP; + } } int wfx_add_chanctx(struct ieee80211_hw *hw,