From patchwork Fri Dec 16 12:11:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 120985 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9304AA00C4; Fri, 16 Dec 2022 13:11:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3AFBE42D23; Fri, 16 Dec 2022 13:11:18 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2052.outbound.protection.outlook.com [40.107.95.52]) by mails.dpdk.org (Postfix) with ESMTP id 2311B42D15; Fri, 16 Dec 2022 13:11:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BjBRaJqwq2S99qcglj69irSDdUpAcv8m1fhzyvpkbXeedLqb5SvFWK6Q7qrt35eumTQu08GTQNPo3TzxhIPLZv5mAw542jl27wrK36cBDTmvSBPp+DP4Dbsvy5T9f313dL1d97OImxcnHZt7F/scyUTmiR5o0pcFkPJinKGNKedAmaasU6Mmu6mnGWx1FzXuvDv7+VxciXzvx5pArOI9nTyNEUNjZsAMWJkXgEqVhsbbYbb03ouWopSEgBNdQZ6zu4qfpjZSkVCX0EzHBVQZwPvwfuS+aj7DtLl9kNt+tRt2S8er+id8Y1oNtmoZ/n1MSDmQXz6GziYOojehBHfrkw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w8iffLItDuVz8yX9/8lkI7kVF3wcF+24ZNd41w2jTIA=; b=M05X3vnT3zPx3u05RkKOFdnQwB/rZQG99ZK3sbRY9B/VaM7FbAiaMjtgGMjZeRrWs5+410/VCZ5RP9d27SmCuCyHFB+tjxyEGqUxsC34MSHG4tUMmBp5gVMJQd5LqdDuWvtYYrBAC2acS4xG7BlyLWMtoClgSnj/Gl6IV7wXE/ZkcMVuy1FgrW/NGV5hZFX2nt7VIg8G/BoHbbhZv5TNRPWg3tyyW2bFfX2U1LyPx7eROTbqGODv+S8Y5KfaIn8/oYfxh8GFBmGO/K2SE1Zr59DhGuNuynHFe6oKx7BG/ZC+v69xibXwQ24zn1zIaW7dVS8PDlpLzUmYRAMZA32QkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=monjalon.net smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w8iffLItDuVz8yX9/8lkI7kVF3wcF+24ZNd41w2jTIA=; b=TR/5fkX1pNoYRQi6Rc4oFj3i0yjBNWaFkM7zXrQjA8152bAq3uJdWVfNWt8PLegjGrG13JDp8eh3IKb41aBhDbyvunnoO4xc2aVAOkv0vm6y+bmUN5r2uOSGzdBSxoHYrWJhMq4dWSTxlqZ7gM975jJNLYkcW6lY0rHAQTaM2t4= Received: from DM6PR08CA0057.namprd08.prod.outlook.com (2603:10b6:5:1e0::31) by DS0PR12MB8220.namprd12.prod.outlook.com (2603:10b6:8:f5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.12; Fri, 16 Dec 2022 12:11:13 +0000 Received: from DS1PEPF0000E648.namprd02.prod.outlook.com (2603:10b6:5:1e0:cafe::f) by DM6PR08CA0057.outlook.office365.com (2603:10b6:5:1e0::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16 via Frontend Transport; Fri, 16 Dec 2022 12:11:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000E648.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5924.8 via Frontend Transport; Fri, 16 Dec 2022 12:11:13 +0000 Received: from telcodpdk.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 06:11:10 -0600 From: Ferruh Yigit To: Thomas Monjalon CC: , David Marchand , , , Daxue Gao Subject: [PATCH v19.11 LTS] kni: fix build for Suse Date: Fri, 16 Dec 2022 12:11:01 +0000 Message-ID: <20221216121101.3553982-1-ferruh.yigit@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E648:EE_|DS0PR12MB8220:EE_ X-MS-Office365-Filtering-Correlation-Id: f25e3617-80f5-49a1-4198-08dadf5ea045 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKUd+w9YCPzgx+FOoO/Lz729Gcdp4fuzYfepm1xbNfznrh3U/G2hAbG6oXNHzg1DOzRCKiyiVBXROFUCyFEsbWriEScFUCyyKO/ie/a5hpeXaG8h4B5wHZnL3ERq4JOACLn7WTpCQ8li05lFpyFElS2FALucysWr0JvyY1JyRZBmrtxPg9C+lCbEDl0DZk0GVkmRXlzrlD3Nao+s+9DZQeb+xvih8CcQdG0SGyelcZtXTYU37pGXPfyMP13ilk1hlUQGpQn4kfP/1ivm7twsjPZMiIRCw1sHNHN1P3kiBP8F51JI1Y0F1DKhvuIoEHU0mwRg/LNOvZa/d3DcrkEbVDE/E7lpu8HHbbMfd+vSXglsuXV0S5SQIecAywdNIdjkAON8Xx/jw+kGYGsCM2AhvS/4ymgFgnDG3q85paMvrJu6iTohhympGPSIQayfJXvIrNC/RbZ5U3PYIxEF0HDl+pDbSxmPN4n7E1t6oVoxAD9W38kVI55Z9GjxVk4cB9gNXkYcMJiT4embTWREZncv0p2Kbb7SuFipKMRLcdxRSjgbD2Rs+7gBT1OvKUu0y0gO/4FgnndBXk5oL+7O4ktmVdBNQSpALI5KinMHEbC+R6vhi3+7NDqSeQs1k2/GwcdYhDE/GPjwT1F+9ctGOdgERuLeGwse1mG+izqrGLnxybRlkTvmuKNGcaxP6MQ87yTjHcFa8KB3xxlIDDBivF3peqiqoQRR+uKslVAVUbUZEFQ= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199015)(40470700004)(36840700001)(46966006)(82310400005)(2616005)(82740400003)(16526019)(1076003)(336012)(36860700001)(86362001)(47076005)(426003)(40480700001)(83380400001)(40460700003)(81166007)(356005)(36756003)(44832011)(4744005)(316002)(41300700001)(2906002)(8936002)(70206006)(70586007)(4326008)(8676002)(5660300002)(54906003)(186003)(478600001)(26005)(7696005)(6666004)(6916009)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 12:11:13.4534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f25e3617-80f5-49a1-4198-08dadf5ea045 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E648.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8220 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Wrong macro is used in the patch that detects if '.ndo_tx_timeout' has 'txqueue' parameter or not, which is causing build error. Fixed by using correct macro. Bugzilla ID: 1141 Fixes: d43fa3e198c0 ("kni: fix build for SLES15-SP3 (Make)") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Tested-by: Daxue Gao --- Cc: christian.ehrhardt@canonical.com Cc: Daxue Gao --- kernel/linux/kni/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile index bf0efab96b33..d125783213fb 100644 --- a/kernel/linux/kni/Makefile +++ b/kernel/linux/kni/Makefile @@ -22,7 +22,7 @@ MODULE_CFLAGS += -Wall -Werror ifdef CONFIG_SUSE_KERNEL KSRC = /lib/modules/$(shell uname -r)/source ifneq ($(shell grep -A 1 "ndo_tx_timeout" $(KSRC)/include/linux/netdevice.h | grep -o txqueue),) - MODULE_CFLAGS += -DHAVE_TX_TIMEOUT_TXQUEUE + MODULE_CFLAGS += -DHAVE_ARG_TX_QUEUE endif endif