From patchwork Tue Jul 17 01:06:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 944636 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="nuMEdUu7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41V2Cr2jl5z9ryt for ; Tue, 17 Jul 2018 11:06:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730890AbeGQBgM (ORCPT ); Mon, 16 Jul 2018 21:36:12 -0400 Received: from mail-co1nam03on0047.outbound.protection.outlook.com ([104.47.40.47]:53408 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730002AbeGQBgM (ORCPT ); Mon, 16 Jul 2018 21:36:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n+DWNqj2sPYSo7Y0n7LredxVP/1+ts2AFwTJUFyRTNA=; b=nuMEdUu77o1rvVrDPnlSuLauJ/h7kYQT1gV9pzlM/SC0xfWZrOhD0Bgt0tD9RHnmsNvmI7LTmQcEjk12QXtdDGLQvtLnTkobQWeO+Sb8fWPVPvsun62qW7uCRi5wf9LIH0kv4/8R0KRRKbjAU/3vOiQdtoQz9XlkaU97agS9bKc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.155) by DM5PR07MB2828.namprd07.prod.outlook.com (2603:10b6:3:7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.18; Tue, 17 Jul 2018 01:06:10 +0000 Date: Mon, 16 Jul 2018 18:06:07 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, felix.manlunas@cavium.com, ricardo.farrington@cavium.com Subject: [PATCH net-next] liquidio: correct error msg text when removing VLAN ID Message-ID: <20180717010607.GA2735@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.155] X-ClientProxiedBy: BL0PR02CA0080.namprd02.prod.outlook.com (2603:10b6:208:51::21) To DM5PR07MB2828.namprd07.prod.outlook.com (2603:10b6:3:7::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d2a703e-d51b-4d65-af5b-08d5eb817c15 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DM5PR07MB2828; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB2828; 3:6DCjrVbyYxr391CO2e3NStdIURMsMg3au9ny1/xtzoNMmcZBr5rbzrjw1slkEM33hs1ALL7vJO7FT32F0RzKXg2/+YKdG8aFrTbXdvkNGeFJcoU/+XgtYNUwmNCioFdbyiG0fbxCctwopTV7iSLi98rPJ7GqJKIzFnHyYlDBDA03EE3jYUpPfgIvwvDyPA3wZmhZtCbtMIEr76ieBoD2JhX9TFkUDD/Qcw95t53ea4bekSUGmkbVN2tv+wvtz65y; 25:9bcJWOZiZzMghombxRIPwuAnvinmI1bg1pNexkJAMB5DgMpEVN7fOj4yE3TdBCdeu6wi4U9xbU3ot/293b65BcXFVCEDzIxmbGNjZ4WeIA/9yUXAvkGQPtHY/TopbLGBREL3qFTT8ebCS9kAnxP8GUiHtFWT2LKqfiPDuPWqZGpUyz7cPFYjIgnLcvVl9h0vwTFOtenrOcoJIcfVc0Ckad2AXwH6pAk6xkN1LMe6DIO0rnT/gFhp/LW03TXJtW5TbE+Ekl4msy7qLnp/5kVwhKVAhWXzwjEynHlE7qiUC2b0U1exlx7DcgSDyScfgLw8+FbVLR0BAj5IrDoO61BFdQ==; 31:Ra0p37wymXco1u/B/QYRtg/UL0ce9bYquN2sZYPh0fG3Xmh0qU5uS+DJBTPdDcnPmrHJRgwoDKm1Ei4Fe3W30HuvY/NnnNPlrkg9C5HnxsWp13pJnQhitUKJeWq0M5A0vOrIDP3/c19OEZosAjQrDEiNL89EhBLn/tCDVSphOgNU1HhNXVtVgp/eqLPCcoh2pcTu5pf2IulBByMwUp7OWWvLqlxS1LV9YTJzPCWzw1A= X-MS-TrafficTypeDiagnostic: DM5PR07MB2828: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB2828; 20:OGdP9MdxdUOLjClxmX0y+3wlJVZPpX7bL/g/TyU7vM2Wej+bG8HGjgLd7x15Y5yD3nHZkRizdrkQf5quhv9XQll88vVHkD76Wqm972ASlQilTSM0RTbvJuKSySPSyyc06fij+HLyrmhyF2wGstDgwu7lzuYVtlMiiMSWJlD9Z+6fIJsMxlivbGHtIvYG25Qc2u/WUKHSv6XDvSSDRju3OJUmdmUz9xVlzmRI0yspiowr8i/lS4K0oyZTnZ6VK8VAHVqcuceqN1eoqXTbu2TTGKGLrNx2wHZ5ldWEUFsuTpqpKMK4ChoLtQL1st2cullxGTT1A6V8bqajvkGf2rOvailUbvXsmCs6i3smUoCG+waXXV0H3Yk/wKTXAh/KmenhiT9s1B19OUTaqSqkRW5KUmCnZ8JOHojtvhrsslwuJ2oTvczKD2wRBgrSiaal/civlsOLjv7fQxLCmNayC2LCqHHVBel6F4tRP330gyDwgqHw606x1ItAaCzm7V13Ojp5; 4:9Xsap1ckxONKksrGLSs6p10ssc8dzQa3Jj2Tgih35cEHiU4ff8eQk4/CBL+2I2gGCi9Ms+ybeEnQqR0x66DrFJiuvbH7QdQfsQk9I7jA5ycp3OFVLGvz0Ae4+G5M2CjlwOCTOo3QAbhQC8GgP5/HwXMyxowqMDsX0AnAnt6QG4Hmkh8h3SjnPHYNsyeJFvWAMw0te9eoU+rHalvQ4oXZWifaIzUJBQU3JC/qTCkq0CBlySaa8++Jb3S5XpGNCJVQrs7rLeRXAmXl0IfgxCVGKw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR07MB2828; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB2828; X-Forefront-PRVS: 073631BD3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(366004)(136003)(346002)(39860400002)(376002)(199004)(189003)(6486002)(4326008)(105586002)(53936002)(106356001)(25786009)(478600001)(72206003)(44832011)(956004)(16586007)(2906002)(316002)(476003)(6666003)(186003)(6916009)(107886003)(16526019)(486006)(2351001)(58126008)(52116002)(47776003)(50466002)(5660300001)(3846002)(23726003)(1076002)(6116002)(66066001)(7736002)(6496006)(305945005)(2361001)(81166006)(8676002)(8936002)(86362001)(81156014)(97736004)(33656002)(68736007)(386003)(76506005)(26005)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB2828; H:localhost; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB2828; 23:zLidKvUBLwJKe3JVSiU41t2v8PiDl1ukVs0prw2L8SlQW16P0/1pJGjguHRNB6ia5xr7Gqr8Wax7WHBgvGde8AJMIYLjhBW47H3f0JpV6ON3EW3E79kj9MqAy7FqgxKHqC9X2ugtFK/u0HxD95svwpJ2FbbmF5AcxC4+9MFnIZ2AwwznOup6dN2F8axdAkONftbwHMKhzepFWq4JHZGlqVNxuOjiOkmhcOv68g0/8BsZEIqwA0Txpe8Vfi1ZmZg3JK2ZZdNMIlmKOk23sqZp0yWnNmXqcvAmbern53K8vLC9f/KQsiuvUUng763fjS5loMAikAedwWDoTp5WDL7JEqGbCG7DIHZ3upLOcp51BRR+il3Ac53+TtfDbxRI3wt0O/niWex700QZ4zg3WxVYh5ChqCZRjU9KkRcx7m+PJd98Uo0JTkjK4gGOddvX1o+yNbX1RC72LBgAT/8WxjFxE3CS8zmokcRy9CaEEGYvn18vT3NeYLisLSSzAI3KmHULUbdjhjB3f8gjqajR0NJTX/UcrIPWkiqnuN+JRuiWWWt8kVmxBYwlECs7RU55ZAt/iAcd7Qu5jPmiJy6jzpg55klrBIiMOxJvoIIqhVjXVfJOwDg4NA8k0/RN8k9V2PxmoeoLfQ7IbIBrkfOrLTWge8JodL1MG7iSY9aY4gxfP/HiBGKG6sw09uFP1uJavddWf1fgwVtY1Vnx1YyWjcI2JA7GABquNxw4gYL9rjinDml5oWnAqdYEHVY23ibrZfJcx3OgGriMsaVyCz+PeBd2lIuoZeJeYMoZw+vJ2nJsxiYxefaia6N1ETfNSgxnifOfVmqCFUXm+wN5DNy2bsaWRbijsqfEb/p1HqTfOH4lJfOo5OoX08kFG5+Wtxq4LQL8ZcsoSGidT98ZrpIxPD8pRgBMWFJHz24McHm7ec6G87nohLV2ddMmp1aZEdsMYA5HK6hD8u5Kf+ld95LNkKcDLLI9TTp0EWo2QxS3W7tFW1LjdAqms24081LYtvI1UTrybl0m0gaBUZDslq04qCsX0JZEsAW7MQvcafSQDUZ7SnMsiwAHEG4UTBB5OazyJrJZwnHRizfJ01wNtVs6ocri/+Lat7QarAkr++XTUZ4v03oAhFhhEi29p6/FVmecjTU3mu/HDQDdh2nnow3OWil3oLn3Xw50tVq1QrxSdCCfLwa0XXXzKQs332msLCWDM7207Pf5+bsMM6o8ay3RuFtMU5ISq+OwxBE4i7K7ecZFFSA= X-Microsoft-Antispam-Message-Info: SkiXRNQSEicx6sr2Q6gDfjWK4xhQ5rwZpW389DYd2sxIH+Gf6CCcLamTDXG2Enj3ovtyD1wwh8/VDOiF3KazOh0qcf8JbmweeNTwRZXaCRNwMMavUcIlyGtcAS8C+2/kScOw5fclMjDW0TkjhWSRZY7XcKrzxWhLn9lSwl+JozVeGtw5wi7DM/B9bY4jqFqPqcVH6+Fz1X8mlfcjA/oBqfZPAn8q6yVSfoN+YoFsMCitglaHobyAugSOmFhG0jayKoex8Ffmyzl5TpL1MWUmgq/F05vz0lsCZVRqj4y6h2JEqvitb7Lzp3Kj60TXloQOplApzpLLbkRiFuV8RcTj+6N9sycqGQWQoNmyR2EkkqM= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB2828; 6:7EOPezQMJeV0TWTFaqTO2FLBg/J71Z8k7iEXQ5MaIVsLnKhYivKtnLDE0H6XUF+1/DwdcTPUpSFxswSonwg1BTyBj2NiTMxRjq1kOFQ7rs47kFfP1GTnzH8o4EXpQTAECl9uU689ee2atidMtX0QWszUePZauY8Q+INOpOfF98D+2kcVHpwRDRahfjEUMnOo3+vrsQw1bLGBROORUis7YFZCyMKdjkD74k/fwngG8Hin30p7eN4Mrp3V+AGQw65eRuPAaKDWqNZfmQ0cR5L04VRHBCoMzq/lte3P1N4pJIiXma3KgTyIY0iPo8p6/jdXW7/QENKOkUwHwXZzG6R+p5Wdtz5J1YQJvj22oaIuoS0qUZwfuS9O9CofQYH1w3fvlSHtNNenSgE2jTFfYIkBHo0hrwWBqrWqIjV5EIa1ZwHAC8ovIqY0BNALivpxToCV4R7tbc3J8hw+k39KIYh79g==; 5:84ReCoac3DOJr2UzRiTmhm33pObGSYJxfKXwaXWRRfIcpY5dJDiOpBc4vqhKUJGQT2P9UvfOBlhJ+Ze5EXYaImdumNquIpsEBjsHBAS4WZG2sRlxcUSZ8qheKpYHleui19DQ32nYhfAj7pDvTtIgyqBmr2Lysj3Ta05026I09bI=; 24:H4GE8vLWtHSU69ilOzAoc4Cbfc+TK7lIkI4HreTffSi9pk8sn+FMhBONAC1ZGgGQ0FZRO4G30DJC2yXS85Xp9Iz8QowCupaq0ead+Ze8nqY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB2828; 7:y4mAWuxUacu2JHoLLsEtX0jHBCwMOQ7JqUO3hxpbvifaiDm2HFEBYEv5B5/JAffQ22PczXMcgl8jYR81vZM/Le/LapZWcV4bDsmBsFmmJy5Xq+AWeqXn5FSasmGI854wi5VfpFW4HEkZB0oE3nLpohkbbfCmBY64AAyzOd/T3yJ8i0BMlFJCOQlnpWhoCb1BPblY3w0jURmWagrM7TnSrCYC9jX+uOGytavEJswgrRJDL7f0A1HP9UZLZIx5uhOP X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2018 01:06:10.4928 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d2a703e-d51b-4d65-af5b-08d5eb817c15 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB2828 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rick Farrington Signed-off-by: Rick Farrington Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index a60d5af..4edb158 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2628,7 +2628,7 @@ static int liquidio_vlan_rx_kill_vid(struct net_device *netdev, ret = octnet_send_nic_ctrl_pkt(lio->oct_dev, &nctrl); if (ret < 0) { - dev_err(&oct->pci_dev->dev, "Add VLAN filter failed in core (ret: 0x%x)\n", + dev_err(&oct->pci_dev->dev, "Del VLAN filter failed in core (ret: 0x%x)\n", ret); } return ret; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 7fa0212..b778357 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1693,7 +1693,7 @@ liquidio_vlan_rx_kill_vid(struct net_device *netdev, ret = octnet_send_nic_ctrl_pkt(lio->oct_dev, &nctrl); if (ret < 0) { - dev_err(&oct->pci_dev->dev, "Add VLAN filter failed in core (ret: 0x%x)\n", + dev_err(&oct->pci_dev->dev, "Del VLAN filter failed in core (ret: 0x%x)\n", ret); } return ret;