From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A54B0A051C for ; Tue, 11 Feb 2020 12:27:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9EECE1BF7C; Tue, 11 Feb 2020 12:27:52 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A61D81BF8E for ; Tue, 11 Feb 2020 12:27:51 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id w12so11908246wrt.2 for ; Tue, 11 Feb 2020 03:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r4DyxyMmG0llsVN7dKrHAXQhqweQ868GlyZpgtl/wsg=; b=kTCretx6VvNsKR9zYxFYisBu2iPkM6P0kofHUVZP/YdlkQoB3zrQYRGQ9OFdrHjDOs MdC1sLZUl0ltdc6KRfVNrZBg6dqBTGgsCdUP/eHnwz4ppw0WaE2YBHrNJL0QGOU+aetq qP6cD37wnaKDI6Dqc1LmFAy5k+uWgpxpxlygixu8ny5E3EnkQSCsu4FXvzdPdXndVDx1 kAtvHtvYU9bfS6ewsFZCYanPcOnPBmuNcHyU4kY5yB3E/nu0AKfF0Pv52Ny8O7dDpHQ/ tabK2PLrC5tBYhWKI7nNCE0lvcK/0SjXwW+Sb9BeUDwuNTz4miDbtnZWxRvwBaQz0xeZ HD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r4DyxyMmG0llsVN7dKrHAXQhqweQ868GlyZpgtl/wsg=; b=nz5PNI7hYxozjtsQuBVjGJ883ECaSs/UAVWhjHg8LxHtVdIFfKf8klHwB8KZc5fhNA 3/bUXNVGF/70onzohrWLr8xrQWgFnvqyz/xFEnMtCEuM1opOa1MoYnKEDb/90oBQVbj7 Uyu6ckjguCoCDqKvQ1EYTzrJwc5bDsDowaC7SVmzLjTLS4YYWg5000CrtX1XPDmqn9FA u3ysotmuhgrifranF7VIA/5lS9nCDugvfvPMML6xb1T2UPXBQCVF/umWBVbFaElDhq3L gCaWZT0tmktviK7dwBrefPGffZGoJCp93D1VNOxuiulaHFbM1TDBjF4JY+0LqBHM4nKg iCIQ== X-Gm-Message-State: APjAAAWxMSiXmdARvAFDReLMnOcZU97Z+fOY4SZMKo+N50UG4QrixV+6 B8LgK8rmeAMu5eTHRrkHeUNDhTjN+7E= X-Google-Smtp-Source: APXvYqy7jERUrYU+A7IPr69lvOYXwMDr37que3KMcM82UIhJ4Hq6Uz7vdnwLjLLaj1Vi5pNYH3Cvyg== X-Received: by 2002:adf:ffc5:: with SMTP id x5mr8369986wrs.92.1581420471423; Tue, 11 Feb 2020 03:27:51 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t1sm3469941wma.43.2020.02.11.03.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:27:50 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Dan Nowlin , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Tue, 11 Feb 2020 11:20:05 +0000 Message-Id: <20200211112216.3929-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix loop limit' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 98f22480010249f4bc20c8e8bfad0c0dee201ba5 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 6 Jan 2020 11:38:46 +0800 Subject: [PATCH] net/ice/base: fix loop limit [ upstream commit c2915d3f8a077d72d359464369d220d7da71e6e0 ] In ice_prot_type_to_id routine, correct the loop limit check to use ARRAY_SIZE instead of looking for the array element to have a specific value. Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe") Signed-off-by: Dan Nowlin Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index afa4fe30d4..621fcfb370 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -4748,7 +4748,7 @@ static bool ice_prot_type_to_id(enum ice_protocol_type type, u16 *id) { u16 i; - for (i = 0; ice_prot_id_tbl[i].type != ICE_PROTOCOL_LAST; i++) + for (i = 0; i < ARRAY_SIZE(ice_prot_id_tbl); i++) if (ice_prot_id_tbl[i].type == type) { *id = ice_prot_id_tbl[i].protocol_id; return true; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.107806551 +0000 +++ 0059-net-ice-base-fix-loop-limit.patch 2020-02-11 11:17:38.448002244 +0000 @@ -1,14 +1,15 @@ -From c2915d3f8a077d72d359464369d220d7da71e6e0 Mon Sep 17 00:00:00 2001 +From 98f22480010249f4bc20c8e8bfad0c0dee201ba5 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 6 Jan 2020 11:38:46 +0800 Subject: [PATCH] net/ice/base: fix loop limit +[ upstream commit c2915d3f8a077d72d359464369d220d7da71e6e0 ] + In ice_prot_type_to_id routine, correct the loop limit check to use ARRAY_SIZE instead of looking for the array element to have a specific value. Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe") -Cc: stable@dpdk.org Signed-off-by: Dan Nowlin Signed-off-by: Paul M Stillwell Jr @@ -19,10 +20,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c -index 3ed84ca016..b2945a9e2e 100644 +index afa4fe30d4..621fcfb370 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c -@@ -4880,7 +4880,7 @@ static bool ice_prot_type_to_id(enum ice_protocol_type type, u16 *id) +@@ -4748,7 +4748,7 @@ static bool ice_prot_type_to_id(enum ice_protocol_type type, u16 *id) { u16 i;