From patchwork Wed Jul 1 15:06:56 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: 1320603 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=EiewfaC3; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xl3P6J0Zz9sTY for ; Thu, 2 Jul 2020 01:08:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731806AbgGAPIO (ORCPT ); Wed, 1 Jul 2020 11:08:14 -0400 Received: from mail-bn8nam12on2056.outbound.protection.outlook.com ([40.107.237.56]:52640 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731343AbgGAPII (ORCPT ); Wed, 1 Jul 2020 11:08:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dLtVOTIyxNjfZ97B5IDP1E8on7lY4OqCW04YfDR1iCWOJWODDnSjY5bgAmprZcDObnW2qcX/jyH6LTcxzScHVtn4d93aTREu3Fc02O+jJmBe4tTx8JRgV+FVMD/QaT+Vd45d/4ojwkcf1S/9QG0aUSahop7w8BWCki9ZurYOddyPfLLfIezSWO46RYZCak1FOEq8OIm8j2C0IfqxjOKS8lYeTVRlJiZem5e/PVAXXoGfFNvaVemCqnb0MVqB8h9KlYiB3ETFvyLK+qr3xH+FItIo/Vk9BgSz5lgHE4I/2CA3bfJHZbZHfaqVgMt4ReI4ox7Oj3Xb9HrWM1O2K68mHg== 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=aimN+AaiepU4T6Nj1hRXGIK/xOM4dQ1aepcJh7YyftI=; b=Z2qhlTLaP/LoVZ7kr1/1xHQl9aWnZQtRcqxe/J/a8RyNpZQlDwQqJUkXlSPNx0uiVaZI0NyK0BApJoW4m+nBdw4R4xVGMr1qVY7oF//v4drJ6eTEvt4eOlVD+l/hIc8DHWd//AWVLqaU6A92NRwcWxKgIS9Iu7g3e3uEXjCZiP1nxxilIhyMP+ekF3j0VlYxTXyZbXc0pZZkM2NBeGbEbJjfK0vR+UnZWN72GHZgIalXs2XTgldSTJxAtBbrzBPeGueL16dH8gP5uiu1tnOCYWvB2jSFX8eSNXJZ0Iq62VYNMWoQCmPEvJT/2IKPWxTkVa71ucVIhzoraJuicZHInQ== 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=aimN+AaiepU4T6Nj1hRXGIK/xOM4dQ1aepcJh7YyftI=; b=EiewfaC3tMrj6aWlCvQW5Adnz90T8b3Nj7OW6NHWyQUzjH8Ib22mFNV8yKtEhWp1tq959UQTN6FF3jjNW4SrKfXr0OIA1/RRHj9l6j+A6sCxr5QMHkzCFhs3CxMH4J4m48WJghDpQTpVzwwr7qAI+Yvw2qYWbBLDCm1lliZskGQ= 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 SA0PR11MB4736.namprd11.prod.outlook.com (2603:10b6:806:9f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.22; Wed, 1 Jul 2020 15:08:03 +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.3131.033; Wed, 1 Jul 2020 15:08:03 +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 02/13] staging: wfx: check the vif ID of the Tx confirmations Date: Wed, 1 Jul 2020 17:06:56 +0200 Message-Id: <20200701150707.222985-3-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200701150707.222985-1-Jerome.Pouiller@silabs.com> References: <20200701150707.222985-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: DM5PR07CA0143.namprd07.prod.outlook.com (2603:10b6:3:13e::33) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by DM5PR07CA0143.namprd07.prod.outlook.com (2603:10b6:3:13e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.21 via Frontend Transport; Wed, 1 Jul 2020 15:08:01 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77499cb5-5cf3-4a1d-4e23-08d81dd08cf4 X-MS-TrafficTypeDiagnostic: SA0PR11MB4736: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vgPRTnkyouHPk4MH3/TrDiLzKM0ZOlM1noE9eDdZ3FcX4TZKB2XPfkpQq31u8RH7EzKAxUWRLt8bzhdPyHGGdM92tkXcN8D7tRfVgrJasaHr5MZ3kZoJG0LjmQ7i3YEFYo6WXhYnXiibKq2GDor0a5SQi6HTtpSEJ0RChmtF+tssDfFAz8qmDocNE5dWEzA6oC+bPMQ/7kJMwxnrPUe2yyv7gEj2oA//7KJqoyFzcvinG+K/bqFWpOfkqJfnBjOZm7cX0ft557YIc9wHbIQoE6JP/9HsiZizCAyOoRkGCynpQ6OqBuqqhQc9Smo1SObzHLpyoaCTSs/xUiXIp1rkgw== 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:(39850400004)(366004)(346002)(376002)(396003)(136003)(5660300002)(6486002)(86362001)(6666004)(66574015)(36756003)(2906002)(186003)(83380400001)(16526019)(8936002)(66556008)(66476007)(107886003)(4326008)(8676002)(2616005)(1076003)(478600001)(316002)(54906003)(66946007)(52116002)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: BR5Y/f71hKQ7+i+gIqQVGKi9zhoG5h5B2UmvB9h24Gg7rYg2ULj1mlQa5OW9jLOU/8qgltnjOBZEtickmPl4f64dskd5sklqgRib/RB6T7GNcCmYCRduB6uPCoq4djXlIThAx3+LM9OSaIAzK0J8O6NaK2yCeGmOztTjDtBu0eklpASMkeAigvg0naKvBz3+f33wuYUw+AWkPUmgp35npQE89QjBmlaC19DyqibAbRTHSY7ecktZhxCJZ+TBw8bMKEyXTDYTAq9wyrCAzJsWzhL99RCTktRlcNKW3Uv4yqvN7T5G5+YtYOLUFBceonQXbhi8r9jirPV4GJVcXDmZImF/PflgSsAm+Rpf7gQ8PtM7i7h+9kXYN6gAMy1jcPAihPf+shdTNO72N9zmfcFhN13EBRotyyU4dzSQUXL6KG7sDxkNXbi0SFuEFtvPATJGF/NEskwWyKRdT5OoSTIcBwZDj/7RZuDXRUB25lnzMKGCHo5EBhmegSFMw0C3WYKeKGc0zVHi9J6cBdtJ9NrMVVdaa0WVIKmVlPwgBLRFQUM= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77499cb5-5cf3-4a1d-4e23-08d81dd08cf4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 15:08:03.0577 (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: JL65GMtsHQRajph+Be1S3+AWoo3JkoRaT+6DslkZKKWQDvZjoe1x93cLPC7ZdgsW7om/Ueoj0J2RKwwLpXdUAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4736 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller When the driver has sent a frame on a virtual interface (vif), it expects to receive the confirmation on the same vif. This patch add a check for that. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 7ec36598d9a83..6069143369f30 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -142,14 +142,18 @@ struct sk_buff *wfx_pending_get(struct wfx_vif *wvif, u32 packet_id) { struct wfx_queue *queue; struct hif_req_tx *req; + struct hif_msg *hif; struct sk_buff *skb; spin_lock_bh(&wvif->wdev->tx_pending.lock); skb_queue_walk(&wvif->wdev->tx_pending, skb) { - req = wfx_skb_txreq(skb); + hif = (struct hif_msg *)skb->data; + req = (struct hif_req_tx *)hif->body; if (req->packet_id == packet_id) { spin_unlock_bh(&wvif->wdev->tx_pending.lock); queue = &wvif->tx_queue[skb_get_queue_mapping(skb)]; + WARN(hif->interface != wvif->id, "sent frame %08x on vif %d, but get reply on vif %d", + req->packet_id, hif->interface, wvif->id); WARN_ON(skb_get_queue_mapping(skb) > 3); WARN_ON(!atomic_read(&queue->pending_frames)); atomic_dec(&queue->pending_frames);