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 049C5A046B for ; Tue, 23 Jul 2019 03:02:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D48DD1BF5A; Tue, 23 Jul 2019 03:02:30 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id EC60E1BEF8 for ; Tue, 23 Jul 2019 03:02:29 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:02:24 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HfO026580; Tue, 23 Jul 2019 04:02:23 +0300 From: Yongseok Koh To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Mon, 22 Jul 2019 18:00:05 -0700 Message-Id: <20190723010115.6446-38-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix port id types' has been queued to LTS release 17.11.7 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 LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From 2a213ae92032aee77f189fcadfbedcfb061958ff Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 20 Mar 2019 12:47:19 +0100 Subject: [PATCH] net/bonding: fix port id types [ upstream commit c4fa09ba8ed585ce68af01d69f1614a1425e86a5 ] Following the port id conversion to 16bits, two references to bonding port id have been missed. Fixes: f8244c6399d9 ("ethdev: increase port id range") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 409bcb5d72..9c9bc0851c 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2083,7 +2083,7 @@ void bond_ethdev_close(struct rte_eth_dev *dev) { struct bond_dev_private *internals = dev->data->dev_private; - uint8_t bond_port_id = internals->port_id; + uint16_t bond_port_id = internals->port_id; int skipped = 0; RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->device->name); @@ -2530,7 +2530,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, if (type != RTE_ETH_EVENT_INTR_LSC || param == NULL) return rc; - bonded_eth_dev = &rte_eth_devices[*(uint8_t *)param]; + bonded_eth_dev = &rte_eth_devices[*(uint16_t *)param]; if (check_for_bonded_ethdev(bonded_eth_dev)) return rc; -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:08.563255296 -0700 +++ 0038-net-bonding-fix-port-id-types.patch 2019-07-22 17:55:06.011470000 -0700 @@ -1,13 +1,14 @@ -From c4fa09ba8ed585ce68af01d69f1614a1425e86a5 Mon Sep 17 00:00:00 2001 +From 2a213ae92032aee77f189fcadfbedcfb061958ff Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 20 Mar 2019 12:47:19 +0100 Subject: [PATCH] net/bonding: fix port id types +[ upstream commit c4fa09ba8ed585ce68af01d69f1614a1425e86a5 ] + Following the port id conversion to 16bits, two references to bonding port id have been missed. Fixes: f8244c6399d9 ("ethdev: increase port id range") -Cc: stable@dpdk.org Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit @@ -16,19 +17,19 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index b0d191d132..df0a3b4190 100644 +index 409bcb5d72..9c9bc0851c 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -2196,7 +2196,7 @@ void +@@ -2083,7 +2083,7 @@ void bond_ethdev_close(struct rte_eth_dev *dev) { struct bond_dev_private *internals = dev->data->dev_private; - uint8_t bond_port_id = internals->port_id; + uint16_t bond_port_id = internals->port_id; int skipped = 0; - struct rte_flow_error ferror; -@@ -2663,7 +2663,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, + RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->device->name); +@@ -2530,7 +2530,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, if (type != RTE_ETH_EVENT_INTR_LSC || param == NULL) return rc;