From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 99B93A046B for ; Mon, 24 Jun 2019 17:26:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 90B971BEA2; Mon, 24 Jun 2019 17:26:02 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DA4841BEEB for ; Mon, 24 Jun 2019 17:26:00 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5834881DE9; Mon, 24 Jun 2019 15:26:00 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 523B519C6A; Mon, 24 Jun 2019 15:25:59 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:35 +0100 Message-Id: <20190624152525.19349-11-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 24 Jun 2019 15:26:00 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe: remove unnecessary cast' has been queued to LTS release 18.11.3 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 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/19. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4b30431215b8121b702403dd83c1c1882b412ded Thanks. Kevin Traynor --- >From 4b30431215b8121b702403dd83c1c1882b412ded Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 29 May 2019 12:15:00 -0700 Subject: [PATCH] net/ixgbe: remove unnecessary cast [ upstream commit 07dcd2378862140daa1662d4d2de1880c0625f64 ] The device private pointer (dev_private) is of type void * therefore no cast is necessary in C. Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/ixgbe/ixgbe_ethdev.c | 33 +++++++++++--------------------- drivers/net/ixgbe/ixgbe_rxtx.c | 14 +++++--------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 6341c1a3e..eafad30e4 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2400,6 +2400,5 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) struct ixgbe_interrupt *intr = IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private); - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; int ret; @@ -2797,6 +2796,5 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) { struct rte_eth_link link; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -4790,6 +4788,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev, uint32_t reta, r; uint16_t idx, shift; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint32_t reta_reg; @@ -5024,6 +5021,5 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev) { struct rte_eth_conf *conf = &dev->data->dev_conf; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d", @@ -5157,6 +5153,5 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; @@ -6913,6 +6908,5 @@ ixgbe_start_timecounters(struct rte_eth_dev *dev) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; struct rte_eth_link link; uint32_t incval = 0; @@ -6982,6 +6976,5 @@ static int ixgbe_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) { - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; adapter->systime_tc.nsec += delta; @@ -6996,6 +6989,5 @@ ixgbe_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) { uint64_t ns; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; ns = rte_timespec_to_ns(ts); @@ -7012,6 +7004,5 @@ ixgbe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) { uint64_t ns, systime_cycles; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; systime_cycles = ixgbe_read_systime_cyclecounter(dev); @@ -7094,6 +7085,5 @@ ixgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev, { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; uint32_t tsync_rxctl; uint64_t rx_tstamp_cycles; @@ -7116,6 +7106,5 @@ ixgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev, { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; uint32_t tsync_txctl; uint64_t tx_tstamp_cycles; diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 55740e75b..fd2d64ac6 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -2917,6 +2917,5 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, struct ixgbe_hw *hw; uint16_t len; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; uint64_t offloads; @@ -3188,6 +3187,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) { unsigned i; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; PMD_INIT_FUNC_TRACE(); @@ -3443,5 +3441,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); - adapter = (struct ixgbe_adapter *)dev->data->dev_private; + adapter = dev->data->dev_private; hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -4587,6 +4585,5 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev) { uint16_t i, rx_using_sse; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; /* @@ -5236,6 +5233,5 @@ ixgbe_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) { struct ixgbe_hw *hw; - struct ixgbe_adapter *adapter = - (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_adapter *adapter = dev->data->dev_private; struct ixgbe_rx_queue *rxq; uint32_t rxdctl; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.663024754 +0100 +++ 0011-net-ixgbe-remove-unnecessary-cast.patch 2019-06-24 16:18:54.981432404 +0100 @@ -1 +1 @@ -From 07dcd2378862140daa1662d4d2de1880c0625f64 Mon Sep 17 00:00:00 2001 +From 4b30431215b8121b702403dd83c1c1882b412ded Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 07dcd2378862140daa1662d4d2de1880c0625f64 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -19 +19 @@ -index 3636b500d..12d0405d3 100644 +index 6341c1a3e..eafad30e4 100644 @@ -22 +22 @@ -@@ -2409,6 +2409,5 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) +@@ -2400,6 +2400,5 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) @@ -30 +30 @@ -@@ -2818,6 +2817,5 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) +@@ -2797,6 +2796,5 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) @@ -38 +38 @@ -@@ -4816,6 +4814,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev, +@@ -4790,6 +4788,5 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev, @@ -46 +46 @@ -@@ -5050,6 +5047,5 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev) +@@ -5024,6 +5021,5 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev) @@ -54 +54 @@ -@@ -5183,6 +5179,5 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) +@@ -5157,6 +5153,5 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) @@ -62 +62 @@ -@@ -6946,6 +6941,5 @@ ixgbe_start_timecounters(struct rte_eth_dev *dev) +@@ -6913,6 +6908,5 @@ ixgbe_start_timecounters(struct rte_eth_dev *dev) @@ -70 +70 @@ -@@ -7015,6 +7009,5 @@ static int +@@ -6982,6 +6976,5 @@ static int @@ -78 +78 @@ -@@ -7029,6 +7022,5 @@ ixgbe_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) +@@ -6996,6 +6989,5 @@ ixgbe_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) @@ -86 +86 @@ -@@ -7045,6 +7037,5 @@ ixgbe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) +@@ -7012,6 +7004,5 @@ ixgbe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) @@ -94 +94 @@ -@@ -7127,6 +7118,5 @@ ixgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev, +@@ -7094,6 +7085,5 @@ ixgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev, @@ -102 +102 @@ -@@ -7149,6 +7139,5 @@ ixgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev, +@@ -7116,6 +7106,5 @@ ixgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev, @@ -111 +111 @@ -index 4be7f72ab..a8ce561e2 100644 +index 55740e75b..fd2d64ac6 100644 @@ -114 +114 @@ -@@ -2920,6 +2920,5 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -2917,6 +2917,5 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -122 +122 @@ -@@ -3222,6 +3221,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) +@@ -3188,6 +3187,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) @@ -128 +127,0 @@ - struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -130 +129,2 @@ -@@ -3486,5 +3484,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev) + PMD_INIT_FUNC_TRACE(); +@@ -3443,5 +3441,5 @@ ixgbe_rss_configure(struct rte_eth_dev *dev) @@ -137 +137 @@ -@@ -4631,6 +4629,5 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev) +@@ -4587,6 +4585,5 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev) @@ -145 +145 @@ -@@ -5310,6 +5307,5 @@ ixgbe_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -5236,6 +5233,5 @@ ixgbe_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)