From patchwork Mon Apr 20 11:34:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 11498631 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C56D913 for ; Mon, 20 Apr 2020 11:37:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AF94206D4 for ; Mon, 20 Apr 2020 11:37:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=quantenna.com header.i=@quantenna.com header.b="L1OFFqec" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726310AbgDTLhR (ORCPT ); Mon, 20 Apr 2020 07:37:17 -0400 Received: from mx0b-00183b01.pphosted.com ([67.231.157.42]:58630 "EHLO mx0a-00183b01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725886AbgDTLhR (ORCPT ); Mon, 20 Apr 2020 07:37:17 -0400 Received: from pps.filterd (m0048104.ppops.net [127.0.0.1]) by mx0b-00183b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03KBXxBk000927; Mon, 20 Apr 2020 05:35:32 -0600 Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by mx0b-00183b01.pphosted.com with ESMTP id 30fvsbm25h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Apr 2020 05:35:32 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXy+V5ux+Z4GfCJqWgt1bEnwDpOuWaUwXtq4sAaPuDqo408pDQEyd+GXaVF4VlyoyYjfw1JXk3RvVbZzwJY/FFLSpykGt3bHMd5i/JYOvpHRC3t+4JatE1vH5Zl4avtzo4A8xOUjBHlwZJcFltWCIv6UWnyVzFdeHj+YI93S+R9XWdRHdiVHVBK0WltzVSOJwwh7T8MkAn7umsXSNijEkjGLhSjIW5DZ3/0MWEpS7c9PFBEFSwQYHR1np1io+gfHfo7SaGTpUj+cw4wBwMJvONKusE+vLnJn6w3xfPC7lyYOdJ6rt3RUH7TmEniqXpx8wXPYHfHEHCqovijTjCEfoQ== 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=VMrsFds6VopZIM3Eys96yadPSA7OjGtgyPSR5Tp1taQ=; b=c6AIIy0TX15huMp9wK2XWexVgG4ZqkybI5OlY2zW1hxN+pHNHZc2TBB62itkHaRUAbiEsvf3kGLZ5FuhvZ0CX3+Qm6MxWeCeyQkLhACR6kKPFslgivtmZXYWMBKFkMYFf96kxPw51tX1ZuX4KthD6n3IhwlgKZWNysEfgzCDbeM+8TP71DSraH8pcizXoIdH0+7bha5NzZRnZFR8njdeRQYOeIe9ntsTkLzGKCVqw07oW9lFQNJjPOeKXaUFHYmqbDtLwao3ay26Ydhi8WkRNn+HxLrCAVAr3Jr6nnpcR9881gnsuitZqDKe3vt9pB+nVPXpI0rBBOJjuhqQxRyVBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quantenna.com; dmarc=pass action=none header.from=quantenna.com; dkim=pass header.d=quantenna.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VMrsFds6VopZIM3Eys96yadPSA7OjGtgyPSR5Tp1taQ=; b=L1OFFqecmsJScGyWXqY1KpVlbzJqKhQGRst83tF7MikmkwKF5wyZ9xcLB2W0/AEip8zusnh9Bo1w1aE9U4+vHzu4SQvc3yAzuukz8Tgsk9gMc0ak3O5zzCyykomtOfdrHpx5EnwcEELWQVzM3yp+TU0KZ8uWP+/ZvX9sWGqBhDY= Received: from CY4PR05MB3414.namprd05.prod.outlook.com (2603:10b6:910:5a::21) by CY4PR05MB2997.namprd05.prod.outlook.com (2603:10b6:903:11::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.10; Mon, 20 Apr 2020 11:35:30 +0000 Received: from CY4PR05MB3414.namprd05.prod.outlook.com ([fe80::4867:cde0:bd3f:3331]) by CY4PR05MB3414.namprd05.prod.outlook.com ([fe80::4867:cde0:bd3f:3331%4]) with mapi id 15.20.2921.024; Mon, 20 Apr 2020 11:35:30 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) by CY4PR05MB2982.namprd05.prod.outlook.com (2603:10b6:903:13::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:34:49 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048]) by CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048%6]) with mapi id 15.20.2937.011; Mon, 20 Apr 2020 11:34:49 +0000 From: Sergey Matyukevich To: linux-wireless@vger.kernel.org CC: Tamizh Chelvam , Johannes Berg , Sergey Matyukevich Subject: [RFC PATCH 1/4] cfg80211: fix mask type in cfg80211_tid_cfg structure Date: Mon, 20 Apr 2020 14:34:34 +0300 Message-ID: <20200420113437.16998-2-sergey.matyukevich.os@quantenna.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> References: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> X-ClientProxiedBy: HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) To CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from bars.quantenna.com (195.182.157.78) by HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Mon, 20 Apr 2020 11:34:47 +0000 X-Mailer: git-send-email 2.11.0 X-Originating-IP: [195.182.157.78] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11e78bda-9ba7-4b54-6582-08d7e51ed572 X-MS-TrafficTypeDiagnostic: CY4PR05MB2982:|CY4PR05MB2997: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-Moderation-Data: 4/20/2020 11:35:24 AM X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-Forefront-PRVS: 03793408BA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR05MB3414.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(376002)(346002)(366004)(396003)(39840400004)(4744005)(36756003)(5660300002)(103116003)(66946007)(66556008)(66476007)(186003)(6666004)(16526019)(2616005)(956004)(107886003)(4326008)(86362001)(6486002)(26005)(2906002)(52116002)(7696005)(6916009)(81156014)(8676002)(478600001)(1076003)(54906003)(8936002)(316002);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WO2GgDkEfCCNCbvhOvfYX10Nifek1Bp6rcWnmSyP5fTHraK3nVRl5F7eeVICuNoXc0opzqEV2PTjiXH2qb6GOtNH38WAcRgPuJJoROPSveRZDa7ovHd4RhJ3xr7bNHIHL4RSowpxzq6EXkqP6lrNX5JDpKBq1GDaUXHzyfd6qWQHfW5oCYkb/rxx5ICz+bZ1vZFsvpgo3AYCJbkxXl/wxJn9KmlShrrcjKlqPrbXK4NtFEvm4ghEqUxnF1ssHMDL1a5l4MSElCO+PDRT8Yo9gY3AOmyYe15egihQA/i0KVbpZ6rvMVKgyfxlL/nIzKtylHi0bX587+VvJ7wBSgtSFjDlmiKRj6yxT+TzU4ZWL7aQTH+jN/UgIlseNggjKmukYDyWpTxLLA42EP+R1Nxk4e1TxHfM+bNwc+kdjLmTrKVLQ3OzVSlKP8JFn00GRnzC X-MS-Exchange-AntiSpam-MessageData: yFSRsmzH4AnoDK0lJFgwKDCTQkrDwDiJ1mgLP4nERsZb79TIDxZhJT48TD8g4Si9c8vk6Ht5fJJR123/KYHJNOHvrZLWkO28nbeANZjbdbAwmc7s9vJb7vvdAn6CABunqYZuW2mu7/HcGdqr6N8UJAl1RzBqyg1MuLpoHvwfybp4v+935KQZjtgXnYTOCMdW5TjLV93ynG3eorNkEasOksFc3T83MEHcx8FOsww+biC3nSBU2ig8c+Lyc7jmivocH3OOn8umIWgkC2KA/AOZf6RFYvWXOZj/J7Yg8a8xYGI9Zo8wSw+DR7MX/L2dMJ0wAskSw7oipGSY4U7vgo+Nq0/LMKSnQyTHMR9binVEVMilal91RLSilf8Y38Taih3t05h/XiBe1m5rp6zOSn9avkM0lo7qeIZnYOUjxyTLj0hgTkFrkytxP1HfY9TSw1o7dOlKcRS38zyfhktkmBHuMN3Zs2LZbuXZcZQmeO+4/TSiSN/xj21LLhmImruZ+8g4bQkOEQr0D57Ng5EQu6/iyrMc9TVjUHxHChHvUiaB9zIZHAb7qFFhpmqv/naKatadcXEAGTJWWYWyopZ7zT2a9IzdPu3WHmEZ/Gjk1V2pf7cVgFaR029wF2G9Gcsnrr7ZAM3X6yGkmLLAa9U0Mhf+qeE+z7JEHstZ1RFvVQZb55VSUtiWHzWqbCpGCUfqgfRbDjUEsN4Jf1THQ+WVu3GZEpuWfjr+XPSA7YXXTLhxPDPSaLH35OBzMZe1ro5o6zFgZ214VvTfYBTpE8B+ezrwFwsOJVmyOAIsFKmyCM0Amdk= X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11e78bda-9ba7-4b54-6582-08d7e51ed572 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ch8OJejqOrA2o3CWchi6DDnXrseb/C0YcH5wQjtEXXU+Kt35kSvjX6L4FE8VAHO+5P3UNwLxfZXbCU/r9uTD8tu1mqAO8HSqnQiTfaFcAwvqq8ILrmX9INEGxiuM9fQETGfpnFZ+UNF3rjox387h3qfAlRm6unKeZ782pYkE5OvmTUmr24/y8xFdcQXH3Gq2p3nDw1KfnRJ9qUY0ttqRvLF9ymeRFBhYjf61jU1xoAQ= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 11:35:30.7493 (UTC) X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR05MB2997 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-20_03:2020-04-20,2020-04-20 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 lowpriorityscore=0 suspectscore=1 malwarescore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004200104 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org TIDs mask type is u64 in wiphy settings and nl80211 processing, see: - wiphy TIDs mask sizes in tid_config_support structure - prepare driver command in parse_tid_conf Use the same type for TIDs mask in cfg80211_tid_cfg. Signed-off-by: Sergey Matyukevich --- include/net/cfg80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 70e48f66dac8..6ff2646ed5fa 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -642,7 +642,7 @@ struct cfg80211_chan_def { struct cfg80211_tid_cfg { bool config_override; u8 tids; - u32 mask; + u64 mask; enum nl80211_tid_config noack; u8 retry_long, retry_short; enum nl80211_tid_config ampdu; From patchwork Mon Apr 20 11:34:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 11498633 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1825E913 for ; Mon, 20 Apr 2020 11:37:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFB0920857 for ; Mon, 20 Apr 2020 11:37:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=quantenna.com header.i=@quantenna.com header.b="ntBquT+3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726362AbgDTLhY (ORCPT ); Mon, 20 Apr 2020 07:37:24 -0400 Received: from mx0b-00183b01.pphosted.com ([67.231.157.42]:55096 "EHLO mx0a-00183b01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726209AbgDTLhX (ORCPT ); Mon, 20 Apr 2020 07:37:23 -0400 Received: from pps.filterd (m0048103.ppops.net [127.0.0.1]) by mx0b-00183b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03KBU0LR030896; Mon, 20 Apr 2020 05:35:39 -0600 Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0b-00183b01.pphosted.com with ESMTP id 30fxf83wnf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Apr 2020 05:35:39 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HA0v7xPiq6vdtcYlkte7z71Ccd52czYx9r7EsiNhm/eFt91Ner3h7M5+QxyJUPOdaXFHqTUbIlCfcTM/aHcMdWXXfzxLjcCb/ls5Bnd/D1uAvD6keRRSzxaFS18PhfYM7c1CCdBRjl8h/v3/uzfnIQIccCd20+iPekU3lQjqdGf1aYq/UGNsCj7VA0czSsvmPGjqx/9Qk9p29XgFlWMHkYXMH1hJwPFIOr2OXrRLFRPS35O7VWoIjrWfhUBVbyyCWvPy31Jao9GixI1yD0hhud9TJt3IFhlZd+9hhKN3Kjo4vjuur3VNQAm6GWGHWPtu4lw/Dn6+He/nh3QwSugKxQ== 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=HXqCTIlBY7Tv8BOLHhomYbCbxRLXDCA3sKnQplGXzsw=; b=gRyv+NbcMaUznVM1NAsBykXMhCMQF9QouT/4fWXiepQ3bm6a/jVNxAXRaIXP7viYW8MXprOfk6D4zfOrnBo3DIrBxRKkIA9ilKxSzSD4T2RsAm3DELWUfC71bRzhwF6apOw+61aOjw61EBKyFFYeBm43I/WJurPInIqJdhniYh2ALMvo7+ugVH7YAy8IlkI3fXRsRsnZgzqTc4whdq7qLCct6G+wQuMEKgBEZDWzWXEBHLTKN2sccRxBfMG3RWyOzWLPM2IFxGR8UVOyz7gsKHpQLQWpsmKbOKeiMqKU1rDeV6m0o+OqXNuwRmm4BCnXEW/GXssacBVsYS5wHlPKJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quantenna.com; dmarc=pass action=none header.from=quantenna.com; dkim=pass header.d=quantenna.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HXqCTIlBY7Tv8BOLHhomYbCbxRLXDCA3sKnQplGXzsw=; b=ntBquT+348a6VPF/LPOv9pIOnxiVDgjsLxzUA25FQ7FYT8TFxSv05oj7HkWI9T8NdRwGJ6+IJiC97/HF3M2d5QNAjYJbDAonu4mleFSkStxD6mEeib3eoDLeuwHfHHjFtUEuMUeBBYRCQvkkIbKhenW9QhNpq9DiUptvLhLR2vY= Received: from BYAPR05MB6439.namprd05.prod.outlook.com (2603:10b6:a03:f1::19) by BYAPR05MB6711.namprd05.prod.outlook.com (2603:10b6:a03:ec::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:35:36 +0000 Received: from BYAPR05MB6439.namprd05.prod.outlook.com ([fe80::50b9:31fe:560:6eba]) by BYAPR05MB6439.namprd05.prod.outlook.com ([fe80::50b9:31fe:560:6eba%4]) with mapi id 15.20.2937.012; Mon, 20 Apr 2020 11:35:36 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) by CY4PR05MB3605.namprd05.prod.outlook.com (2603:10b6:910:51::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:34:51 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048]) by CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048%6]) with mapi id 15.20.2937.011; Mon, 20 Apr 2020 11:34:51 +0000 From: Sergey Matyukevich To: linux-wireless@vger.kernel.org CC: Tamizh Chelvam , Johannes Berg , Sergey Matyukevich Subject: [RFC PATCH 2/4] mac80211: fix variable names in TID config methods Date: Mon, 20 Apr 2020 14:34:35 +0300 Message-ID: <20200420113437.16998-3-sergey.matyukevich.os@quantenna.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> References: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> X-ClientProxiedBy: HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) To CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from bars.quantenna.com (195.182.157.78) by HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Mon, 20 Apr 2020 11:34:49 +0000 X-Mailer: git-send-email 2.11.0 X-Originating-IP: [195.182.157.78] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88f7567e-17aa-45de-d476-08d7e51ed683 X-MS-TrafficTypeDiagnostic: CY4PR05MB3605:|BYAPR05MB6711: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-Moderation-Data: 4/20/2020 11:35:34 AM X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-Forefront-PRVS: 03793408BA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR05MB6439.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(366004)(39840400004)(376002)(346002)(396003)(136003)(6666004)(54906003)(107886003)(4326008)(26005)(66946007)(1076003)(6486002)(7696005)(52116002)(66556008)(66476007)(36756003)(478600001)(2616005)(81156014)(8676002)(103116003)(6916009)(316002)(2906002)(186003)(16526019)(86362001)(8936002)(5660300002)(956004);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zbxWBo0gW3m+Jk+F2udBnEBlNL6+4zwbe3zsAHvV3oZum4cIRUKyAATc4XcrRBTgYJqFFk1EeHh6QauVlBOYke7e3dQ9ZPJQHB6IfQQGYi9Ww78vEE/0beDLaW00LT3B+0OMwVb+WVbVKIqpCdmtsr8A7onZ6ClLE4hBwvNLPgxyZagAd0UQ40BldYoaBlv/YM1bRLhNIZOWF5z3Y0xYYO20kydryndmVTDigHz474hD/dH4qy1D6eH5tnRbhtxocIM1SDdz7dM1ikx+MawhIwfdRCklEua973wJ7b/nCXEVpFG3HOxg3XaW6yijh/5PZw6xDTWefNJH335PjLttMAvLFuoJFsrlgLAH7AOdTUdvgNGScn89k12ftJ2ZNCBEMMLS6hErbDPP9LqRINpO3Q+rEFeRfEjtnRc6m5xZI3dwtHbr6XOTgXsw1yoxGYb+ X-MS-Exchange-AntiSpam-MessageData: fHO2so6pGmh16To5FR1pVa17xsmm2YZVDSvoFupNESw3+bXXXlspjb/4u78eR/9HvtF/ycKJIdx6ps8mth/+a9Isod5232lKWPCBR09t7s0WDLbhZB5maYJYDXWHvT2U5huiu9bbbrFceyuujlNnwF+c4408j67WGLfujFoCqNHXioU4LHz2PgVCyuDjfa5cSq3GjYybU0ZHPHB0D15BploPYQohHqR30EbGxgaDPNJmpyiqqVvaviBvUMJLAxHSTh2gKYtbzzal59RnnXI2dYqFDa08XH8qHfSlunLPXdnZoj3rq4AoDyA+fDrIzT2V0XIP0uEFAolodrpQ9cVpvOxuWSwIlc8bS1BvJ7IAcbW1MwPxYOdD2G/flCXoMI4/Vm6EFj1o/14Awa0fdCKPI/VRgpIn8bMVBF+K4Q1kK9mRymajRgo8CU7cw5UkKtCU9ROkcIbZf4aL7bCA1RZIAWrY2cWeXBhv8KeEf2w+DAvLJ/ANchDz79/GfUNLus+xAJ0MMzIZ/477p++sFCyrogNmHj9VVHBZKVx+2mF0YbIhaFLcXh1Kz+5muqPNvePUQ6Hq6OGBykb4/tK8hRAVGfgxitHkX3XDEbcgCVqqjugy7lEPb32hp5QmvP0wGQHKEH/FBh34r33HK1pxfH7Df0HUnpdcRuWztoH5qQ0ujR6M7bFvKpGEShLJK8vKjsjIoMU6z2XjBC1CqmcJb41UAosFSDwA9Ob9sIyCeQvASNo6ejcXbqp623y8gkHsGgKCa+YW6f8rjAu/Kts7C1Ibrh9gUyiUyXta7LacXi5DleE= X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88f7567e-17aa-45de-d476-08d7e51ed683 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9Ssx+t49tkqornFHWvLphF947K1TBubTQ4qQpT0YNoqjS5+M2ByNLzxoT75DucQN1c5S54VUSWqhHrf5HseJd9ug1sPNNrQnW81JX4sOM7Amyic4m8X728J4sDtI2fSrhhj6fzXBCZF/wGHlo3T2NpwAXw5UzF9+YY+tdzJCRrtYp8532nCL+3k73kTyqtdffa+EHEJs2uOkMdrR9QKPIx1wLBYb+JPLPSgEZ9kBMV0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 11:35:36.7817 (UTC) X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB6711 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-20_03:2020-04-20,2020-04-20 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 impostorscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 spamscore=0 mlxlogscore=985 adultscore=0 clxscore=1015 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004200104 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Fix all variable names from 'tid' to 'tids' to avoid confusion. Now this is not TID number, but TID mask. Signed-off-by: Sergey Matyukevich --- net/mac80211/cfg.c | 6 +++--- net/mac80211/driver-ops.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 0f72813fed53..e8ec658a3c7b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3925,7 +3925,7 @@ static int ieee80211_set_tid_config(struct wiphy *wiphy, static int ieee80211_reset_tid_config(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 tid) + const u8 *peer, u8 tids) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta; @@ -3935,7 +3935,7 @@ static int ieee80211_reset_tid_config(struct wiphy *wiphy, return -EOPNOTSUPP; if (!peer) - return drv_reset_tid_config(sdata->local, sdata, NULL, tid); + return drv_reset_tid_config(sdata->local, sdata, NULL, tids); mutex_lock(&sdata->local->sta_mtx); sta = sta_info_get_bss(sdata, peer); @@ -3944,7 +3944,7 @@ static int ieee80211_reset_tid_config(struct wiphy *wiphy, return -ENOENT; } - ret = drv_reset_tid_config(sdata->local, sdata, &sta->sta, tid); + ret = drv_reset_tid_config(sdata->local, sdata, &sta->sta, tids); mutex_unlock(&sdata->local->sta_mtx); return ret; diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 3877710e3b48..de69fc9c4f07 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -1375,12 +1375,12 @@ static inline int drv_set_tid_config(struct ieee80211_local *local, static inline int drv_reset_tid_config(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - struct ieee80211_sta *sta, u8 tid) + struct ieee80211_sta *sta, u8 tids) { int ret; might_sleep(); - ret = local->ops->reset_tid_config(&local->hw, &sdata->vif, sta, tid); + ret = local->ops->reset_tid_config(&local->hw, &sdata->vif, sta, tids); trace_drv_return_int(local, ret); return ret; From patchwork Mon Apr 20 11:34:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 11498627 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CC60913 for ; Mon, 20 Apr 2020 11:36:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DBED206D4 for ; Mon, 20 Apr 2020 11:36:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=quantenna.com header.i=@quantenna.com header.b="JBCGMZDn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726234AbgDTLgE (ORCPT ); Mon, 20 Apr 2020 07:36:04 -0400 Received: from mx0a-00183b01.pphosted.com ([67.231.149.44]:65512 "EHLO mx0a-00183b01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725886AbgDTLgE (ORCPT ); Mon, 20 Apr 2020 07:36:04 -0400 Received: from pps.filterd (m0059812.ppops.net [127.0.0.1]) by m0059812.ppops.net (8.16.0.42/8.16.0.42) with SMTP id 03KBZhJg026281; Mon, 20 Apr 2020 05:36:00 -0600 Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by m0059812.ppops.net with ESMTP id 30fv3svmjk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Apr 2020 05:36:00 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eNXvnECMSZ8CuSbV7hfA7wRVDHi8Bvcc0EGs3jzrlm4trsJYMfJJE+YEluy+IsVrE4/mbpHt5KjEKM0BcYHL8kMeJi0Hcv3Y97G1yXi+1a3fZdEWhpEKrEs+I+UtSyjvkNZ7NM03xy+M/Z2gAb3LrU4F0ikcP/YZvv0yNzHgEGYuiRBIheMFqw6QPy+K4ypcD1FeeS2PIH7dsqFETSs2Mf+VlpnqsMI+OdKxj/0wXGjEJvEo+1DTz+ThshQZjLtfZOZ7O8Gq1qSTq/+Irva4tv3H84tnubwDrS9ldXWM0em36f0XjV+IPVzg5xU7aEGfGjnaFu1twnup+NyeP0mILg== 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=Xcb8wRdfCPM8cgUHHc8oQWP65KXHb3+f37OOShvlpSg=; b=ZrCNCvYNDXysZBa1zIIcQrcqGNFQO64NRhY8TMqYfLlkbj9E1guHiKrE2CkChB4WLysef5B0aJbeL5wiz3SXx9xHbhMcO7yzADg3Um384njbpvHVEjB7q5zJAapc/58uSXcaaZdadnOZT0umrVDzL/cCKrDJWuSIIJ8n7OuU91Bz2zeetl+NgCf0kt6+pZe7LUr0EaDJOlv6qAJOwl6a9KlKHqApAMcO1m2XhggC9rXO9rnri1cuO5ae88SqmgfNhkXQB8Gwf0ZXdYipoRvAk/WIA3FMmeSdi3ZSH4KvMRA1D3QhuBHZzQTak2BJLhiY8vr9BcPftEXjSbAwMbcYWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quantenna.com; dmarc=pass action=none header.from=quantenna.com; dkim=pass header.d=quantenna.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xcb8wRdfCPM8cgUHHc8oQWP65KXHb3+f37OOShvlpSg=; b=JBCGMZDnCdzrUlhX+u6ort0t8ICVUyrTJ5VdDCaqRoX2iDGca4RzMV7zYoZtP+QLNRCjDEkJt+3HZ4TWoRF2Pk1300UcTDYYBzZKbZiMtb0lvejNUMuXg9wwWn1CXT3JFcerTWM381/Kdb77BoaLEks44dmgP4zaL16kmdaiIJE= Received: from DM6PR05MB5801.namprd05.prod.outlook.com (2603:10b6:5:106::30) by DM6PR05MB4043.namprd05.prod.outlook.com (2603:10b6:5:8e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:35:53 +0000 Received: from DM6PR05MB5801.namprd05.prod.outlook.com ([fe80::bd8d:8575:c72a:8191]) by DM6PR05MB5801.namprd05.prod.outlook.com ([fe80::bd8d:8575:c72a:8191%7]) with mapi id 15.20.2937.012; Mon, 20 Apr 2020 11:35:53 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) by CY4PR05MB3605.namprd05.prod.outlook.com (2603:10b6:910:51::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:34:52 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048]) by CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048%6]) with mapi id 15.20.2937.011; Mon, 20 Apr 2020 11:34:52 +0000 From: Sergey Matyukevich To: linux-wireless@vger.kernel.org CC: Tamizh Chelvam , Johannes Berg , Sergey Matyukevich Subject: [RFC PATCH 3/4] cfg80211: add support for TID specific AMSDU configuration Date: Mon, 20 Apr 2020 14:34:36 +0300 Message-ID: <20200420113437.16998-4-sergey.matyukevich.os@quantenna.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> References: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> X-ClientProxiedBy: HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) To CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from bars.quantenna.com (195.182.157.78) by HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Mon, 20 Apr 2020 11:34:51 +0000 X-Mailer: git-send-email 2.11.0 X-Originating-IP: [195.182.157.78] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11b75613-bd49-4229-7216-08d7e51ed766 X-MS-TrafficTypeDiagnostic: CY4PR05MB3605:|DM6PR05MB4043: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-Moderation-Data: 4/20/2020 11:35:30 AM X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 03793408BA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR05MB5801.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(376002)(346002)(136003)(39840400004)(366004)(316002)(478600001)(7696005)(52116002)(2906002)(54906003)(86362001)(8936002)(4326008)(2616005)(956004)(103116003)(5660300002)(66946007)(81156014)(26005)(66556008)(107886003)(36756003)(1076003)(6666004)(8676002)(66476007)(6486002)(186003)(16526019)(6916009);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qJtpJtrMvHEjfd4GszfzVxQwB26+yNl7eKxIwH/A52XapY6hGXSKQ9fokbMdDg3xGpeHaJya196USD7DmtGt8uRyCEeEpap2jjLCMxgAD5fnOTSo34XDs+mD3O/SRvGLIU+zyd6lPV/8RM7LKbZM4FYmPkPmsgjnMkaktyH6PLeTeK2MCDFNrBHCoFgoRVc7T/YLkpCTBuCUdl+gWYmMTK98aenoM4zcwc+A+0bun0yi9NR63euu8zxaCWAPMHGO9j0Ce6fRYCIESKCBPaa/RkUVUk9s2e9eCQkU0eA3ZbqaZRRE0OjoLfJeEW4ns9B81BZ3q+1nsF33Jzaqwchi8irCen5KGJJkO4Y4ZPZDAeRvIVi0lkBYs2YVeCxpVGn/WrMBjs2zkvjUhisW3m+WHvFxKL9TDCyZbmghPI4q4lP4m/xCNokOOpRh0K5hDMkP X-MS-Exchange-AntiSpam-MessageData: gUKvyItLe5hj7rjE6egROpKPGkWkB9vtL89fZm2pXGOAxUIGg7Ty2tWYLlDPly6XKTClZ1rIpV9sQ4JvX0Rtel4Yzcpeeciozv3NMSXlrlOuiu9GlP2kKCPDG7UrVV8KXoUTe4S2m/CVOadYiwySsA== X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11b75613-bd49-4229-7216-08d7e51ed766 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C+0fkR4Dcjt8HK7E6LBc2vF2QJVvjfDEvpEVCzzWPm8DCak0fyHuKCqGOB/3MS3LMYAGzDyN2zpw7dNQ1Mn+03ZGAw03toBh42ZOgl2sfk3usjmw/UkAP2iW6RZAIW4IR2HRoaDFcLtEZAuNE2JcyNJHpTI2WR7pMJVr47FAGwKN+1jb35yLlksDHnl2qg8UId4biHWtCupche68gcVSfHUlxhipzJ1d+dbeddOWORg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 11:35:53.1970 (UTC) X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4043 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-20_03:2020-04-20,2020-04-20 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 impostorscore=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 mlxscore=0 suspectscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004200105 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This patch adds support to control per TID MSDU aggregation using the NL80211_TID_CONFIG_ATTR_AMSDU_CTRL attribute. Signed-off-by: Sergey Matyukevich --- include/net/cfg80211.h | 4 +++- include/uapi/linux/nl80211.h | 10 +++++++--- net/wireless/nl80211.c | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 6ff2646ed5fa..6dfae972730c 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -636,8 +636,9 @@ struct cfg80211_chan_def { * @noack: noack configuration value for the TID * @retry_long: retry count value * @retry_short: retry count value - * @ampdu: Enable/Disable aggregation + * @ampdu: Enable/Disable MPDU aggregation * @rtscts: Enable/Disable RTS/CTS + * @amsdu: Enable/Disable MSDU aggregation */ struct cfg80211_tid_cfg { bool config_override; @@ -647,6 +648,7 @@ struct cfg80211_tid_cfg { u8 retry_long, retry_short; enum nl80211_tid_config ampdu; enum nl80211_tid_config rtscts; + enum nl80211_tid_config amsdu; }; /** diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 2b691161830f..1bf34a39c776 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4828,12 +4828,15 @@ enum nl80211_tid_config { * &NL80211_CMD_SET_TID_CONFIG. Its type is u8, min value is 1 and * the max value is advertised by the driver in this attribute on * output in wiphy capabilities. - * @NL80211_TID_CONFIG_ATTR_AMPDU_CTRL: Enable/Disable aggregation for the TIDs - * specified in %NL80211_TID_CONFIG_ATTR_TIDS. Its type is u8, using - * the values from &nl80211_tid_config. + * @NL80211_TID_CONFIG_ATTR_AMPDU_CTRL: Enable/Disable MPDU aggregation + * for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS. + * Its type is u8, using the values from &nl80211_tid_config. * @NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL: Enable/Disable RTS_CTS for the TIDs * specified in %NL80211_TID_CONFIG_ATTR_TIDS. It is u8 type, using * the values from &nl80211_tid_config. + * @NL80211_TID_CONFIG_ATTR_AMSDU_CTRL: Enable/Disable MSDU aggregation + * for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS. + * Its type is u8, using the values from &nl80211_tid_config. */ enum nl80211_tid_config_attr { __NL80211_TID_CONFIG_ATTR_INVALID, @@ -4847,6 +4850,7 @@ enum nl80211_tid_config_attr { NL80211_TID_CONFIG_ATTR_RETRY_LONG, NL80211_TID_CONFIG_ATTR_AMPDU_CTRL, NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL, + NL80211_TID_CONFIG_ATTR_AMSDU_CTRL, /* keep last */ __NL80211_TID_CONFIG_ATTR_AFTER_LAST, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 692bcd35f809..ea0e588b6f6a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14104,6 +14104,12 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL]); } + if (attrs[NL80211_TID_CONFIG_ATTR_AMSDU_CTRL]) { + tid_conf->mask |= BIT(NL80211_TID_CONFIG_ATTR_AMSDU_CTRL); + tid_conf->amsdu = + nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_AMSDU_CTRL]); + } + if (peer) mask = rdev->wiphy.tid_config_support.peer; else From patchwork Mon Apr 20 11:34:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 11498625 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A5C492C for ; Mon, 20 Apr 2020 11:35:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 577512078C for ; Mon, 20 Apr 2020 11:35:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=quantenna.com header.i=@quantenna.com header.b="MX+Jelx8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726091AbgDTLfs (ORCPT ); Mon, 20 Apr 2020 07:35:48 -0400 Received: from mx0a-00183b01.pphosted.com ([67.231.149.44]:27138 "EHLO mx0a-00183b01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725886AbgDTLfs (ORCPT ); Mon, 20 Apr 2020 07:35:48 -0400 Received: from pps.filterd (m0059812.ppops.net [127.0.0.1]) by m0059812.ppops.net (8.16.0.42/8.16.0.42) with SMTP id 03KBZhRj026294; Mon, 20 Apr 2020 05:35:44 -0600 Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2176.outbound.protection.outlook.com [104.47.57.176]) by m0059812.ppops.net with ESMTP id 30fv3svmj9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Apr 2020 05:35:44 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VcBVaO4wFDjnASrOTNg9GcVzw/nnsaXnQR04O1xJoYJfJGyUtc7qkm/NncAXy7CYfl4f1rJGDZE8SxvzHGVLw55Po6XqbIsuO1Nk4nZDxpfBhhHtFNZve7qSqr1PY4+p6gMnJnas+K7rux+Y8w7Phj9xb7jm+qf34Xo0lHQk0M3fP5k7IHzK/ZiditIam+0dRjpC1FZi/pgG7gnRhjnV0rj6cDTzo+Vs5BYfH/z6Ei/JpFe5MiDK3BGbPU0NF9iZrkTQ+wcoHMT+rSRefUc/5SwWW7SB2Qz+oV9Wu/2IqvYMeT4YR3RjCwfyTOg7FBB9cfRWt+HKqMS6yOZBdj5+cw== 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=DAIjepzaDnZinsJSW8HKsJ+UcjpIH71OMgkZiuoceJE=; b=Kn4xAtzX973v/Tycf59QJOg4BpzMNN90QUmDIWGz8HwnYW78OhbQ4JqJzA2l9lGzkwnZioWc4ev2HHP1Ywvq+vye9dhOMAmtkWGYkuvSb7uBFDyzwMXPMBOKQNYwnBYuIrklVRxszRAUGZv2M5PeIVmO6I78dKrw4LScdnZevnbvxqYm1mcZqz78LdW2UUobFhaW9sbmAoihR2dtWtlQprUDjmiO2APQMyLFNNtNVuVachMb4Pmzw2E7rUIGDZkZjOUJ4PGIwgnoZF5FrQHHBmgB6EtQrKfjnPOCi7OY3rIzelhVDTRMrQW7gOl7WuYXPZKU7VczXsLuNDKUNBmJhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quantenna.com; dmarc=pass action=none header.from=quantenna.com; dkim=pass header.d=quantenna.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DAIjepzaDnZinsJSW8HKsJ+UcjpIH71OMgkZiuoceJE=; b=MX+Jelx8km0WBbkvr8g6y599YbwpsJsv8UCAxArWGDSPoJ1jUYGQXLI+WYNugS7TT+/LHli/BPB1RkcOzOD+mS1J90PyPHdVeAk4gPYfr8rWhEkoATe0GEGWRFyxSNoeUGS67Vc7VY0qaQe6+ej7sV3lJzmFMyq04VNMHGbEBw0= Received: from BYAPR05MB6309.namprd05.prod.outlook.com (2603:10b6:a03:cf::22) by BYAPR05MB5413.namprd05.prod.outlook.com (2603:10b6:a03:78::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.20; Mon, 20 Apr 2020 11:35:39 +0000 Received: from BYAPR05MB6309.namprd05.prod.outlook.com ([fe80::d8c0:3fd8:fcf2:2221]) by BYAPR05MB6309.namprd05.prod.outlook.com ([fe80::d8c0:3fd8:fcf2:2221%3]) with mapi id 15.20.2937.011; Mon, 20 Apr 2020 11:35:39 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) by CY4PR05MB3605.namprd05.prod.outlook.com (2603:10b6:910:51::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.6; Mon, 20 Apr 2020 11:34:54 +0000 Received: from CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048]) by CY4PR05MB3558.namprd05.prod.outlook.com ([fe80::f5eb:c5ec:8fe4:e048%6]) with mapi id 15.20.2937.011; Mon, 20 Apr 2020 11:34:54 +0000 From: Sergey Matyukevich To: linux-wireless@vger.kernel.org CC: Tamizh Chelvam , Johannes Berg , Sergey Matyukevich Subject: [RFC PATCH 4/4] nl80211: simplify peer specific TID configuration Date: Mon, 20 Apr 2020 14:34:37 +0300 Message-ID: <20200420113437.16998-5-sergey.matyukevich.os@quantenna.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> References: <20200420113437.16998-1-sergey.matyukevich.os@quantenna.com> X-ClientProxiedBy: HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) To CY4PR05MB3558.namprd05.prod.outlook.com (2603:10b6:910:53::39) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from bars.quantenna.com (195.182.157.78) by HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (2603:10a6:3:77::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Mon, 20 Apr 2020 11:34:52 +0000 X-Mailer: git-send-email 2.11.0 X-Originating-IP: [195.182.157.78] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9df923b4-26e5-42c8-afb9-08d7e51ed850 X-MS-TrafficTypeDiagnostic: CY4PR05MB3605:|BYAPR05MB5413: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-Moderation-Data: 4/20/2020 11:35:33 AM X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 03793408BA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR05MB6309.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(39840400004)(346002)(136003)(366004)(396003)(376002)(1076003)(2906002)(66476007)(66556008)(478600001)(186003)(16526019)(7696005)(52116002)(6486002)(8936002)(2616005)(956004)(81156014)(316002)(66946007)(26005)(86362001)(54906003)(4326008)(36756003)(8676002)(6916009)(5660300002)(107886003)(6666004)(103116003);DIR:OUT;SFP:1101; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AaMyeLLmD9r/L+RfHOLKT+ArtCcvfEJ/O1IijZMgJqvYCnTcTm5sNMLbKDv5pxVJtYvNyggzbnFDK4dEZzvQEKLFogwCkS4rXdVeW71JG9NMSK7CEyEOLk/K7XrCWDte4OmWwnn3QRZDqq+M2/LMxGC6ZoM8fta4/TiOGivodr9SJCvCf3nz5L/604Lb1fXs7jj1JUSeni7etMah2wFcroHtnGhuQA+cQ5s3krwhCr81RD9oubqBrgH103/EmmVSOrmTmjFyshh2U8U8tx7aW21dVsLmCvlQEhEjkfzkycVE3RScSvqQJ/lUyNrRf+npoJbxZsdWBCYMI1G26et+hgz+GvFL+lrWwqaIl3VBNEQ7LZptJavZ9vrdkzD3FWiUdxysyiLQmcPmdyvaw2saHAipKcZOlMdd8tARfx+Dc7g7BMelpduNTy4jd+z8Rrog X-MS-Exchange-AntiSpam-MessageData: Gr+CzTKBrkTsR6Enn/u8fLGo14X1EcSBtQbtjeff5I0RSYA057P6vbSRpqP7ji9K0OzZ2cFQdvjKIwg/3pF82SCafFmQuKF0SBFyMe8nVoJZD11uaQgsq4jyHjVu97WjebXdu+B7CvhWYsXb2BPIGUlMQxAeRYk+zWHu7MdZCdvAyQGD+ZsdQ9Mhz1DJzZHosd4a5hWm4kRL6eyq9we96/6iFRfnNY5YycC+3/uqSSIbwP+1lHAIE3GkCwdPnVmTIqEL3XHCrgP97mClLRFydq/CCp9IbDO1S8KRvmNtfnNlWLyEFj/r556re744h6zm5c/ABEyJQ+3r7dUAmr9oTagOggbk0ILwqaro0GlzgUd1dBYD9mEu5SAv/RDwxjbreEJ8nxgQucecksKTowDbOz4PGPTwzPNUPQO5C6d7spcHJhbxl2Rq+tT2GYSjYxta3fSFnyPXglGYcvh41qbx5/eF5UuHrv2hxxwwTarWrxZRyM++GTKiKHbQwWr03H+5s7nbgH83rHjcSvYSibdOw+fB9B3g17GtvOJwk3iLFRCD51gT9mpclQfAQJhbjVc5N0vFEb0EBp46EID8PUQEXVdGQqrch7mJarwDmE6mOkTkkEnmxr4U497a9ALYe9Ar7M7gWPKMXZT5MBu31SP/wHe7Zm7HjNji7Ftmn+9maiHb5CHpxxwP8nXgNfsPKh+CoL5tWVcBWDQyTYEFpbmbtEgvYxPQer70zkAEWdDhWoybtXXo7bzchS0hKvWo1K2ltz0zRBo8MWHwHy/7qQTYbYMYoK9HuphWevVS/xruM3c= X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9df923b4-26e5-42c8-afb9-08d7e51ed850 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8i0ujGzRDhmn1gbC+LLB/Jd0mli0hhgaa4D8mS7VaUgFAjSAFU7w6iVaytOPmcB4b1rib8aNhjgqE2H6plXhC+p0RIAFlEb+jgfliQFQiD2XdMOmYOiqE96RQwx83aLQjDjR0SqL88tFSEJvdu15jo9rbeDz6XmvvQ81XuKYBVIvHyo1hN5kk67l3pcx++xD6KY9VziexTkHukEecEQlvg3IaRUUHesthsAKU+ZkpBY= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 11:35:39.2256 (UTC) X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB5413 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-20_03:2020-04-20,2020-04-20 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 impostorscore=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 mlxscore=0 suspectscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004200105 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Current rule for applying TID configuration for specific peer looks overly complicated. No need to reject new TID configuration when override flag is specified. Another call with the same TID configuration, but without override flag, allows to apply new configuration anyway. Use the same approach as for the 'all peers' case: if override flag is specified, then reset existing TID configuration and immediately apply a new one. Signed-off-by: Sergey Matyukevich --- include/uapi/linux/nl80211.h | 10 ++++------ net/wireless/nl80211.c | 5 +---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1bf34a39c776..003e25ce3899 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4807,12 +4807,10 @@ enum nl80211_tid_config { * (%NL80211_TID_CONFIG_ATTR_TIDS, %NL80211_TID_CONFIG_ATTR_OVERRIDE). * @NL80211_TID_CONFIG_ATTR_PEER_SUPP: same as the previous per-vif one, but * per peer instead. - * @NL80211_TID_CONFIG_ATTR_OVERRIDE: flag attribue, if no peer - * is selected, if set indicates that the new configuration overrides - * all previous peer configurations, otherwise previous peer specific - * configurations should be left untouched. If peer is selected then - * it will reset particular TID configuration of that peer and it will - * not accept other TID config attributes along with peer. + * @NL80211_TID_CONFIG_ATTR_OVERRIDE: flag attribue, if set indicates + * that the new configuration overrides all previous peer + * configurations, otherwise previous peer specific configurations + * should be left untouched. * @NL80211_TID_CONFIG_ATTR_TIDS: a bitmask value of TIDs (bit 0 to 7) * Its type is u16. * @NL80211_TID_CONFIG_ATTR_NOACK: Configure ack policy for the TID. diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ea0e588b6f6a..03f7870875a0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14058,10 +14058,7 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, if (rdev->ops->reset_tid_config) { err = rdev_reset_tid_config(rdev, dev, peer, tid_conf->tids); - /* If peer is there no other configuration will be - * allowed - */ - if (err || peer) + if (err) return err; } else { return -EINVAL;