From patchwork Mon Apr 27 06:59:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chi-Hsien Lin X-Patchwork-Id: 215819 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 E5619C5519A for ; Mon, 27 Apr 2020 07:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C028F206B6 for ; Mon, 27 Apr 2020 07:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cypress.com header.i=@cypress.com header.b="jh8sZaDa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726701AbgD0HAY (ORCPT ); Mon, 27 Apr 2020 03:00:24 -0400 Received: from mail-dm6nam11on2125.outbound.protection.outlook.com ([40.107.223.125]:31151 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726543AbgD0HAX (ORCPT ); Mon, 27 Apr 2020 03:00:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=faSpu96iYRjrltkQfXJ69avcbkjGF1avJYpOTN0AiPwVYgo161uF57Te87R85GwbLBt9wQPkJKloXFYPcb67h1/dk2ddwF6sKASirRrlGcFqpqlVLK2CyqES8nHByONsNUznX/Oi8P/LR1P6+MZczSGgjnN5Kk/S8eDScyUntHdHDp/vvwO6OIQ7YWR4tZCTSsQF5vsdS0fCvUbodbZdKMUNTRTVdhfzTSe/L6nWI19988XkoFkaoekmfeg7Hiw4QqI1eEHR/MgF7mxQdyhiHOsqKRg/omHoZ/LH3YWDcgtGULEJdQu12R8uoc/YYmWKhDvxV6ApD6RORsc9db2J9g== 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=KqwLjPBK88ybm5dc3367G4KXqpTmmy3OBaRuJznbLhE=; b=Bj59GzmlBr3P4Zqdrey7JW06QkMH7Tns8R8WMwab7t9cVX8JyC/+2EKT66Kl25tZ2bGCtiOTW0u072moHvQe/HXR8N0R7fHgzsPDhk07FraZQ0XDWm3NHFsHx2kAoNFI5q5NroohiSmn222g4gyM3CT3LkSVE6V783uF/s0zQE5B7/a+RpqtMreOoBEk6f1lhtCtcsxt8SMFtEbZAw7TXIUaS+ulGyjO5Z5jJQbuJaUhhWOFU8TSMX03tTgcsq6fiH0cvIe5g6tWhlMlxKNW5bRGk+ArqWnkdBQyKrC0BpmMeesU47gxRS6MpfeDU0jQQ3NbNeT3vrOwELULBGWkwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cypress.com; dmarc=pass action=none header.from=cypress.com; dkim=pass header.d=cypress.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypress.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KqwLjPBK88ybm5dc3367G4KXqpTmmy3OBaRuJznbLhE=; b=jh8sZaDajOGtRcuoI4D2Hcm1yEGcSHLz2A9/0JaGR90sU9enpVmnILzvvLhJd7KmtXiyqEh6i3kZl0QU41uIdBiQ7VQzW7p37RDe4+vWsl+oJot3zeJpIHLbP9aYwk0mI6tFvM7++HtQtfozDZsCjI0nLde/OL5508dUO+cAqoc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Chi-Hsien.Lin@cypress.com; Received: from BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) by BYAPR06MB4551.namprd06.prod.outlook.com (2603:10b6:a03:42::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 07:00:20 +0000 Received: from BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1]) by BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1%3]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 07:00:20 +0000 From: Chi-Hsien Lin To: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list@broadcom.com, brcm80211-dev-list@cypress.com, Arend van Spriel , Franky Lin , Hante Meuleman , Wright Feng , Kalle Valo , Chi-Hsien Lin Subject: [PATCH V2 1/5] brcmfmac: keep apsta enabled when AP starts with MCHAN feature Date: Mon, 27 Apr 2020 01:59:59 -0500 Message-Id: <1587970803-77700-2-git-send-email-chi-hsien.lin@cypress.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> References: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> X-ClientProxiedBy: BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) To BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from aremote02.aus.cypress.com (12.110.209.245) by BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 07:00:18 +0000 X-Mailer: git-send-email 2.1.0 X-Originating-IP: [12.110.209.245] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 844efc89-2201-4f22-e465-08d7ea78a5e6 X-MS-TrafficTypeDiagnostic: BYAPR06MB4551:|BYAPR06MB4551: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:826; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR06MB4901.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(366004)(26005)(8936002)(81156014)(8676002)(52116002)(7696005)(86362001)(956004)(5660300002)(16526019)(6916009)(186003)(36756003)(498600001)(6666004)(2616005)(66556008)(54906003)(4326008)(6486002)(107886003)(2906002)(66946007)(66476007); DIR:OUT; SFP:1102; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vw4t2I6fmFPoWd6gcjLGnxpUL+yKdhS3jLq46km5Knym9GLQymcaS2L4GX565CZI3NvrdXBGRkw7/F2fdPoPOW7ffyp5An3IHOgEvvzoB3vsJhtUUQrElcS26Sf4E/jim9gFflL7QhyqtDG/3CY9DyXvQ8pQFTWFQyc8XTuAjUbatTVoBN1WbxMVAKrKHjabNrKWOfzAkImaqtfZJD9ZXlWZbJb+w41IyQJi//0AYeYBT6xLv5G3omzhi0wmo+gynAA7WfEBc9FWYLLGZeseX+H5VXreuXLomz3Edwt64ZCQ0V4zxDNBKlN9Sm+RstGAqp+dMBEryTU2TrFGpntGtumF0ML29tZsUmdzX5V71RwuMH/2R39yXKwjGef2GdNU2I6QLP+nUjVavOPxu6lNjDGicEQMHX49/J/z6ecGIo6kwNn5k2YQNgXQJgD6plu4 X-MS-Exchange-AntiSpam-MessageData: p92H2yKyy/f4QdysXyVg4yMnnh6DGzujQSvLaPTk4Zd+346pGwBJ2CBblS5gJK6saAHX+qxtFh3sAK/Lxf1xShV4ri7/3YdSfNIN/aQ340XlD642Tg1vjB5kYf8cTQ/DopLnIZen/VnRsZgxXZX3BJSPe3ZSo68zOXAjF7TCw3V1KqR7AvwQnzK4JqjHG3GnNYx4WemsfHLThxd0yEpxQe/geI+5qd5mF4oM15nGl2jOEgz0Qb21CBd/SfV8t5rOkHowXp2GfadEVA7vUBQy88PigEM8YN48P2EX+o06OySVjiwzSu/y9gPzUn6/rUGdNuCBtDpyf+Wtal78OYMxtcC+uolnS8cYNWu7cUOvR2P6G7ZqZTM69LLeEksh6TLIvReHl1uWoBZPbHH09lagfVjcZ9fjBYYXDLilczKMPKgC9tYycpzJ6hWbDdA8jgNdkfs4Os9gA6zPgqYMh9xqwuSxidXko58L53oZdKb0hprV1inQXm2cdggx3sunPdABZCWyTS38kJKgUUlQ/4QIg8ajVIHXunJdB1jM/hZJjfwx64yELC/oZmg7bTea52pr2guf4hMHplh+1ZPc9ZEpaHxuovO+BlmIzxB8ULcwqj2HCYvslu9qWUJi2tSTw+dZoLAlevG7N4Ypmg7s2JEgHTG8bG4XjYJhe+F1PHA40qQl7z1ZMulLQexashpEwaDstORyGu0LqY+nU8WzcvoOuyA9kZH8EeSoD6NrXp72a3sJHGhcUSRzM50aEz2l+w7xvGqyCJgfqJeqj+GSR8gi8bNDITr349P1WCDpF1MfqKI= X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-Network-Message-Id: 844efc89-2201-4f22-e465-08d7ea78a5e6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 07:00:20.2588 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SeOBTS+CnTVJZ9NFrg24Jdku3LC+VVC7Gkiy+I3uh1N0BKfgirHiok42PuLAWX4E6JNwX6Ht6cHv6Ki1bjn0TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR06MB4551 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Wright Feng When starting station mode on wlan0 and AP mode on wlan1, the apsta will be disabled and cause data stall on wlan0(station). The apsta feature with MCHAN(Multi-Channel Concurrent) or RSDB(Real Simultaneous Dual-Band) can make STA+AP work on two bands concurrently. Because of that, we keep apsta enabled if firmware supports MCHAN or RSDB features Signed-off-by: Wright Feng Signed-off-by: Chi-Hsien Lin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index fa846471dac2..e54f6fa6dc8f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4727,7 +4727,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, if ((dev_role == NL80211_IFTYPE_AP) && ((ifp->ifidx == 0) || - !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) { + (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB) && + !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)))) { err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1); if (err < 0) { bphy_err(drvr, "BRCMF_C_DOWN error %d\n", From patchwork Mon Apr 27 07:00:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chi-Hsien Lin X-Patchwork-Id: 215818 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 46A7EC5519A for ; Mon, 27 Apr 2020 07:00:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 176162075B for ; Mon, 27 Apr 2020 07:00:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cypress.com header.i=@cypress.com header.b="m1ip3d0L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726584AbgD0HA2 (ORCPT ); Mon, 27 Apr 2020 03:00:28 -0400 Received: from mail-dm6nam11on2125.outbound.protection.outlook.com ([40.107.223.125]:31151 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726543AbgD0HA1 (ORCPT ); Mon, 27 Apr 2020 03:00:27 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MWQDlsXIBGj3b/OkKlIFSh0Urg4cmaf+KW7alOZsY2OP+mO8dvBj4N6tZB3IB5cZmMxrFboRJuZ/98xYgbnf5TEdgqk9jyKEV7sAGDvryoi1O5zBRrlCK89uc+WBj4O2nDhxofmh469yIqSfCeaTeG5v1h/ZS7hX39Fr79vNPoKJYzLRG2PxZt7ZM8EO1G/0ubQnW8/FOtGTmkwbMtjYDIdIQH6NcXg7XJVeL9y4XmE9Uv5mwTxnKiLUrLElb5xR+CWEUSxwWelsiHs465KOeCF1A3c+JmKENmQH+DHeQ006vT/sH3l4riJus08JE41J/qzJYItiUUWZP0GFv0VC+Q== 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=ONkNghBu/oCKFbhfgFAneKhCGuR7sGZ6ydFKPrDzuS8=; b=hqtlW3GOceRYjoS9DmSY+D+lmm8aFffNTYNYHBVPbgDieqa/p1I8fp/tjoXdk//ZnZQLsZqQT03TmUmypSxNSG+b4/gediBEunR5PMiXCoXxqf6D+2exuYcvnu54Z886RjauTtiP1WQarQ4C1Pzc+3ufCzC9tz9hrcbsx7AxnkUgoSWm36dnIMUF2VRUhbGihZSF1kOh3W2UgxfWkL3wXbiS9+A5Pr7rmAt0c02/9oB71Jm+EoaG/DfTkA1l2LPomVL1RwxpCpMXvd/5wQChNJC/6XChmcqCytNgoY/HW1kdwSxS3a0VwROQwXTINl7BJva4mwIFqI7U0Lu1KyA2AQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cypress.com; dmarc=pass action=none header.from=cypress.com; dkim=pass header.d=cypress.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypress.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONkNghBu/oCKFbhfgFAneKhCGuR7sGZ6ydFKPrDzuS8=; b=m1ip3d0LS5BDHihg9jKtFBuFbNTfs4TMbx6aiwEHmTmroudjjT6qz23V+AiN14Yf2wUa316so4e8XW/tHBAPkMxnYrB8e2NGswMVyz7z1ZIz0fYmWyhRzUgBs55CvcySxoLnWbqADUXk8h+GMbjFAxdy2VdSJUX7wAjj6iFdjwI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Chi-Hsien.Lin@cypress.com; Received: from BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) by BYAPR06MB4551.namprd06.prod.outlook.com (2603:10b6:a03:42::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 07:00:24 +0000 Received: from BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1]) by BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1%3]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 07:00:24 +0000 From: Chi-Hsien Lin To: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list@broadcom.com, brcm80211-dev-list@cypress.com, Arend van Spriel , Franky Lin , Hante Meuleman , Wright Feng , Kalle Valo , Madhan Mohan R , Chi-Hsien Lin Subject: [PATCH V2 3/5] brcmfmac: p2p cert 6.1.9-support GOUT handling p2p presence request Date: Mon, 27 Apr 2020 02:00:01 -0500 Message-Id: <1587970803-77700-4-git-send-email-chi-hsien.lin@cypress.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> References: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> X-ClientProxiedBy: BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) To BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from aremote02.aus.cypress.com (12.110.209.245) by BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 07:00:22 +0000 X-Mailer: git-send-email 2.1.0 X-Originating-IP: [12.110.209.245] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 40e068f1-084b-46e5-f620-08d7ea78a840 X-MS-TrafficTypeDiagnostic: BYAPR06MB4551:|BYAPR06MB4551: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR06MB4901.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(366004)(26005)(8936002)(81156014)(8676002)(52116002)(7696005)(86362001)(956004)(5660300002)(16526019)(6916009)(186003)(36756003)(498600001)(6666004)(2616005)(66556008)(54906003)(4326008)(6486002)(107886003)(2906002)(66946007)(66476007); DIR:OUT; SFP:1102; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i3zI767ZS16Vj/pgdRas1rXWkcAtFOWbHnoE/3761/jUPhwjPcVxhHS34gAxykKPoKKVQF+GsU3bc5esubUTMoPEF7OMNMRsWXPs1tobyEMk7JZUjFyewyw0yisWAvwy9D6iNHimG4k2pg8LLpAH4dV5/RnYl3C/Tre2yKFqI/s3dFLxRhiMB+Jf5i0mY3z+mp9h7uLB0+9HDpZG2hAEpiWGUfbYof6GkNfvJYtjL6rBDREQZhEkkQ5FiffIcBM0HScpvXBPpVQKeQvvqG43f1lCMzeAPpGmPu8TuMmxOew2plITu6DCwN+PomTNUAqENU6yVdl7qCQKtTTlzB9X/GRPGeBaCSZN2TN5ApRZP0joIapEZ6dzIF3fUlIrkRDbRn37ElinMSNTe3nokrLTMgujvyLw08Plkc+aFofjr17OTIjIeuuYzDeIpGs+Rfho X-MS-Exchange-AntiSpam-MessageData: i6gKgXfVr9sjBGnh9GTrvj+Vg/QjUMVoGgtYCB8bLVB+h12YU6B9hTSt6ksHRkKWEmuNdvDZ0hF4Y9vTIL2BR4uCNpnz+MLpvlmuxLNWwTHhn1IaCV9zp8DCd0nKr8plfdyEOsMmDNDmAJGLsV6alpovEO0t2CvUUPXFG+kPzE0jKWOqbcX3VrcpXeMX5ad+0DUXP26kJbeU8Jy7TR2+/MFPjKBz/I8mWcWwK885Ld/mB28yWV0JAQ62wNPdXrDcS57qqZrjEvM4RcRj5QYAiPLB+cEEndMLPNsRe6pp6wO/unnhHMI1oItJeQGBrqHtRWrp8ORCt5JyafQubawMIUiYIoCtWymQGMzELReZ+HnR1jP6BpOgSBOBYBAayCWC9KmXm0S1Jy7xuM/6lHrwfX4zcqUcfqTKBWhSduJcSx5gPLk2fok8g+KZEa08DBHAe55v6/2ULvVcOfZyeE9AqPFGsaGsouDgaQ7eWfCetEn69qmPLTfRz4uzJ9O79n+5O8BkwFB3ImXAvLY7A7F1qz5eVtOu3lOAptX8HoI3uJx9f5zrm737jfpxOGNaMOu+AX4Rs17nD+e6DwF+/Wdsh/paPoHWHpAEWs/74jFK/sTpq4M8W56Sf9QCgQOnDexvV0H2hX2z+y7nHfCvLjxJFoCq6JCN9TgGzYm47ZbEgXEVPlrxtelYf07TQVMTs0a4IevjWDPBuh/6LgBZSyKiok4Rcv/EsGqVPGSoWEkMu18eEjGEFAh3mj35oY73YPrmGZ/eURaTzuEvNDzfOjpRQRWqr5UqszHh7BdCi1SOCjo= X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40e068f1-084b-46e5-f620-08d7ea78a840 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 07:00:23.9777 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xc7dIV82BITdcWqy04/YQ7fVTOtyWnYrL1OFtUGyoAPjoKI4ni2kqsOOEFlBFhqw20ePydj5MdNYsqgNv1Pc/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR06MB4551 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Madhan Mohan R Send p2p presence response from the p2p interface address instead of the p2p device address. This is needed for p2p cert 6.1.9 to pass. Signed-off-by: Madhan Mohan R Signed-off-by: Chi-Hsien Lin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index 1f5deea5a288..c68edb198819 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -1491,6 +1491,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p, { struct brcmf_pub *drvr = p2p->cfg->pub; struct brcmf_cfg80211_vif *vif; + struct brcmf_p2p_action_frame *p2p_af; s32 err = 0; s32 timeout = 0; @@ -1500,7 +1501,13 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p, clear_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status); clear_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &p2p->status); - vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif; + /* check if it is a p2p_presence response */ + p2p_af = (struct brcmf_p2p_action_frame *)af_params->action_frame.data; + if (p2p_af->subtype == P2P_AF_PRESENCE_RSP) + vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif; + else + vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif; + err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params, sizeof(*af_params)); if (err) { From patchwork Mon Apr 27 07:00:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chi-Hsien Lin X-Patchwork-Id: 215817 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 2FAB2C55199 for ; Mon, 27 Apr 2020 07:00:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04ED7206B6 for ; Mon, 27 Apr 2020 07:00:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cypress.com header.i=@cypress.com header.b="RJY7F0Aw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726646AbgD0HAd (ORCPT ); Mon, 27 Apr 2020 03:00:33 -0400 Received: from mail-dm6nam11on2125.outbound.protection.outlook.com ([40.107.223.125]:31151 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726434AbgD0HAc (ORCPT ); Mon, 27 Apr 2020 03:00:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ilxmQqIwkdKTaCwmzj6UWJCPJQbw49VMnUHKszqaeqH3VvBeL6VRCxOCh4IiYqHTUYHGJvQN72fT9HYPRX6JM8PuIi+/yV1myTm7EW185SrzjFw4Eq45haREHYXXNG+ivlIcqjFwnoukitgEdqxOs2uvWPpa+wczpoAmx4iIxpHcVuBRWiJJOpPnr5P0SleXsWk0YWAjvADHVJZvuHhee5AoVeofbsB9SUUpCFB/bvrHSeAWWu2M4sarUEqMmzzdqK+RTxO04QsCfgfSIdRe/dpCaq1NfKrInsrrHXQidsqsnb9mU4XHvABjczX+8XbpINIzWokv9d2JnZ0NXzHd0w== 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=YpuAdz3njl+cB+PGJxAT6Otc8k1KkD9OfqWQuqE3a7I=; b=kyzHT0DJqugUbmeWg4X7XxzuuI9E6pVfXIPYJErJjjHNk80j2Ou/SE1vnzvz8OFs633Bq+hpjwlYplQBe/OLW3rx0zG0HjaMBeRGMRg4VSvhin9ihT+cJFJHYBXiB6BDixSKFdW73ppID9VbTe4HTKhtR8BHRYqa8wE/ZoQ9+2T0ycQtdDGVnhKG1fCIhYR997PyULha/AmppjTwNZ2+OBx0dMjXVnA8GsW7ondqSQhONmPWCyn0r7jPzsFz2puP8cuqRwldYXr7XKS19eSYJoyFyVYrk59OHAEqHEEfnDd5Qt9fvVjVpxv6wv9qE7PD5aWAgwDvO/1230JIISx3fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cypress.com; dmarc=pass action=none header.from=cypress.com; dkim=pass header.d=cypress.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypress.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YpuAdz3njl+cB+PGJxAT6Otc8k1KkD9OfqWQuqE3a7I=; b=RJY7F0AwVd8dyQD3z9FHBQdTBHPIiAb36b2x5zr2JQ712YrJKIHl+JmNA6YX6iOEfxYtigtoyBDRj8n8JNnSHpozrCbR+XZ5xFscC67cFIHy9eV/t5f1AbkssN91ftVGihf3w8sHy5mJAhZV7rzoZ8GxLh6ef7sboHcqUgWU2uA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Chi-Hsien.Lin@cypress.com; Received: from BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) by BYAPR06MB4551.namprd06.prod.outlook.com (2603:10b6:a03:42::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 07:00:28 +0000 Received: from BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1]) by BYAPR06MB4901.namprd06.prod.outlook.com ([fe80::69bb:5671:e8b:74c1%3]) with mapi id 15.20.2937.023; Mon, 27 Apr 2020 07:00:28 +0000 From: Chi-Hsien Lin To: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list@broadcom.com, brcm80211-dev-list@cypress.com, Arend van Spriel , Franky Lin , Hante Meuleman , Wright Feng , Kalle Valo , Ryohei Kondo , Chi-Hsien Lin Subject: [PATCH V2 5/5] brcmfmac: add vendor ie for association responses Date: Mon, 27 Apr 2020 02:00:03 -0500 Message-Id: <1587970803-77700-6-git-send-email-chi-hsien.lin@cypress.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> References: <1587970803-77700-1-git-send-email-chi-hsien.lin@cypress.com> X-ClientProxiedBy: BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) To BYAPR06MB4901.namprd06.prod.outlook.com (2603:10b6:a03:7a::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from aremote02.aus.cypress.com (12.110.209.245) by BL0PR02CA0041.namprd02.prod.outlook.com (2603:10b6:207:3d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 07:00:26 +0000 X-Mailer: git-send-email 2.1.0 X-Originating-IP: [12.110.209.245] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1da6f307-2d71-48d8-2c72-08d7ea78aa82 X-MS-TrafficTypeDiagnostic: BYAPR06MB4551:|BYAPR06MB4551: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 0386B406AA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR06MB4901.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(136003)(366004)(39860400002)(376002)(346002)(396003)(26005)(8936002)(81156014)(8676002)(52116002)(7696005)(86362001)(956004)(5660300002)(16526019)(6916009)(186003)(36756003)(478600001)(6666004)(2616005)(66556008)(54906003)(316002)(4326008)(6486002)(107886003)(2906002)(66946007)(66476007); DIR:OUT; SFP:1102; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9I8dGvdq6LHEi4NLmEhPjEr26T/G6Nr7n6faHAKYR7DHsPkWziTFznlk7L44SgmMYYYA/KWMh2QirGxAbVEmqXmR0kb7xkswFZk3ZGvGLBtEhfVKZo5Ka8ohdtnPfSvu3+260MkDHe9jZw/tX8NuXxEJkiC44qaVzMGJB40s+t5kfFzGVoT9YkSpKfwPfOGvOh9KhaUc9yr68cGFLIq1enPsl6gssfusCzbL10wiNALzhdZYdCBATc/bpYlhlL0ca1SJ8atOAcnX7rSmTVVr694h3KoCr8QHo3M/Nq9X59HramK24icqgtV0JL3Qa9I4ZD5MzNz8qZV8OqtDr8G99o7su2KKlUhrMXSKvb8J3zmKFKzF1rgpnKn6C2XnIW22U01Iz6d2Kkw/yPWOyK/9lFKyvv3RiMXPymfLXSyDgCs1Cc2VkwJ2buAvOsencIey X-MS-Exchange-AntiSpam-MessageData: QGsMbKnGoifIqQCS3kW+kPm8GFmGmhpRf6B28FbRh22msfrUtTcGDLFuS+HJMYXCwBdLZbyfnam+Afxl7KlfUl7RIbcrLjw3/s+6zrKCfc+coTEQmj+BCYqB1hTiOyz/9v43+j/aF6vGolT9/F+IiT+RnMWqACPl/eXNnZQuZwT8YfI9btNnSCTgZ2TwjGzthZyEywzY+WAWC2j0ceXmJIQsW7fAQZzoc4bFaOv1a5XECC2KcUT5ZZogN/e7LsgrC+ME34cITfccMgACDpGvFQfcATfyYtpzDvugZp0Ne7aRSZjkFBMUmlfMdCoh0gL0afkAa08tZU5r98bG5lbF8qEblymNRvk8jXIa7MoDXpfN849O+/Ef5a80c3+3EaEQpSkLuaVBQJqjr9z+Bvc8HMQSOiWPRHYWcIMfihZGSiRBu6dFSArBCzG/EolHlCwg6VhtfdO7DKSYk6utEhrth8GasesI4rCuoFEw4/I74MeBVRLOHBG6EG/67LE4A2Z7FKHaWyKZDtZg1LkFzQdF8wEPaFLMV9HzKqlBHsHKab4w0ENIkD3upnWblUywHVjvgfD9NxiJlx0R53pm9gYdmw3EqeH3P5aLhhoTV1n4eqMPD6x02b/8BNUFTzosdCsb/++Sb7BQxMlQotC9LcSIdyKgf28Yry5O/gexVVILCWQbxIVhdYOPwyymnB1CyQPbYBaD6Piw0Mv+n8JJpZXMQBQ3X9SLQMtCe+Prw7aj4X4p+DIxnHFGGZ+88eqaZe6d8t4QxPrmtDVadY5b84/UWJAJw4Z/OQ0CYtRmdB1QHSQ= X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1da6f307-2d71-48d8-2c72-08d7ea78aa82 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 07:00:27.8274 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +p6pfsSgxukLFqZL92DZJQwdKQdNpa+beW0qKdR64QbwZyZDgoDtR6AWi614PoS+PIoIb3p5zibAgszkRg9B8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR06MB4551 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ryohei Kondo Miracast Certification clause 6.1.2 may fail if there is no WFD IE in p2p assoc response. This change allows WFD IE to be added to p2p assoc response. Related WFA certification: 6.1.2 P-SnUT operating as a Group Owner accepts a WFD Session with a Reference Source Reviewed-by: Arend van Spriel Signed-off-by: Ryohei Kondo Signed-off-by: Chi-Hsien Lin --- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 14 ++++++++++++++ .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index e54f6fa6dc8f..4bd69d85fab9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4449,6 +4449,11 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag, mgmt_ie_len = &saved_ie->assoc_req_ie_len; mgmt_ie_buf_len = sizeof(saved_ie->assoc_req_ie); break; + case BRCMF_VNDR_IE_ASSOCRSP_FLAG: + mgmt_ie_buf = saved_ie->assoc_res_ie; + mgmt_ie_len = &saved_ie->assoc_res_ie_len; + mgmt_ie_buf_len = sizeof(saved_ie->assoc_res_ie); + break; default: err = -EPERM; bphy_err(drvr, "not suitable type\n"); @@ -4595,6 +4600,15 @@ brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif, else brcmf_dbg(TRACE, "Applied Vndr IEs for Probe Resp\n"); + /* Set Assoc Response IEs to FW */ + err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_ASSOCRSP_FLAG, + beacon->assocresp_ies, + beacon->assocresp_ies_len); + if (err) + brcmf_err("Set Assoc Resp IE Failed\n"); + else + brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc Resp\n"); + return err; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h index 6ce48f6275a4..3ca8c07d6370 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h @@ -153,19 +153,23 @@ enum brcmf_vif_status { * @probe_req_ie: IE info for probe request. * @probe_res_ie: IE info for probe response. * @beacon_ie: IE info for beacon frame. + * @assoc_res_ie: IE info for association response frame. * @probe_req_ie_len: IE info length for probe request. * @probe_res_ie_len: IE info length for probe response. * @beacon_ie_len: IE info length for beacon frame. + * @assoc_res_ie_len: IE info length for association response frame. */ struct vif_saved_ie { u8 probe_req_ie[IE_MAX_LEN]; u8 probe_res_ie[IE_MAX_LEN]; u8 beacon_ie[IE_MAX_LEN]; u8 assoc_req_ie[IE_MAX_LEN]; + u8 assoc_res_ie[IE_MAX_LEN]; u32 probe_req_ie_len; u32 probe_res_ie_len; u32 beacon_ie_len; u32 assoc_req_ie_len; + u32 assoc_res_ie_len; }; /**