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 DC9E3A046B for ; Mon, 24 Jun 2019 17:25:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D0BC01BE1E; Mon, 24 Jun 2019 17:25:57 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3441A1BED9 for ; Mon, 24 Jun 2019 17:25:55 +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 A49AF356F8; Mon, 24 Jun 2019 15:25:54 +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 617C819C6A; Mon, 24 Jun 2019 15:25:53 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:31 +0100 Message-Id: <20190624152525.19349-7-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.30]); Mon, 24 Jun 2019 15:25:54 +0000 (UTC) Subject: [dpdk-stable] patch 'net/e1000: 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/d6228b5684243f74f68bb375c79b40ef1f583282 Thanks. Kevin Traynor --- >From d6228b5684243f74f68bb375c79b40ef1f583282 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 29 May 2019 12:14:56 -0700 Subject: [PATCH] net/e1000: remove unnecessary cast [ upstream commit 130d2b77f0e507b4a41372aca94854d2f37cea53 ] 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/e1000/igb_ethdev.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 87c9aedf2..96ccf9763 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5022,6 +5022,5 @@ igb_start_timecounters(struct rte_eth_dev *dev) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; uint32_t incval = 1; uint32_t shift = 0; @@ -5074,6 +5073,5 @@ static int igb_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta) { - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; adapter->systime_tc.nsec += delta; @@ -5088,6 +5086,5 @@ igb_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) { uint64_t ns; - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; ns = rte_timespec_to_ns(ts); @@ -5105,6 +5102,5 @@ igb_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) { uint64_t ns, systime_cycles; - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; systime_cycles = igb_read_systime_cyclecounter(dev); @@ -5199,6 +5195,5 @@ igb_timesync_read_rx_timestamp(struct rte_eth_dev *dev, { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; uint32_t tsync_rxctl; uint64_t rx_tstamp_cycles; @@ -5221,6 +5216,5 @@ igb_timesync_read_tx_timestamp(struct rte_eth_dev *dev, { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct e1000_adapter *adapter = - (struct e1000_adapter *)dev->data->dev_private; + struct e1000_adapter *adapter = dev->data->dev_private; uint32_t tsync_txctl; uint64_t tx_tstamp_cycles; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.456837758 +0100 +++ 0007-net-e1000-remove-unnecessary-cast.patch 2019-06-24 16:18:54.954433041 +0100 @@ -1 +1 @@ -From 130d2b77f0e507b4a41372aca94854d2f37cea53 Mon Sep 17 00:00:00 2001 +From d6228b5684243f74f68bb375c79b40ef1f583282 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 130d2b77f0e507b4a41372aca94854d2f37cea53 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -18 +18 @@ -index 29c550052..4436f9d3c 100644 +index 87c9aedf2..96ccf9763 100644 @@ -21 +21 @@ -@@ -5030,6 +5030,5 @@ igb_start_timecounters(struct rte_eth_dev *dev) +@@ -5022,6 +5022,5 @@ igb_start_timecounters(struct rte_eth_dev *dev) @@ -29 +29 @@ -@@ -5082,6 +5081,5 @@ static int +@@ -5074,6 +5073,5 @@ static int @@ -37 +37 @@ -@@ -5096,6 +5094,5 @@ igb_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) +@@ -5088,6 +5086,5 @@ igb_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts) @@ -45 +45 @@ -@@ -5113,6 +5110,5 @@ igb_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) +@@ -5105,6 +5102,5 @@ igb_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts) @@ -53 +53 @@ -@@ -5207,6 +5203,5 @@ igb_timesync_read_rx_timestamp(struct rte_eth_dev *dev, +@@ -5199,6 +5195,5 @@ igb_timesync_read_rx_timestamp(struct rte_eth_dev *dev, @@ -61 +61 @@ -@@ -5229,6 +5224,5 @@ igb_timesync_read_tx_timestamp(struct rte_eth_dev *dev, +@@ -5221,6 +5216,5 @@ igb_timesync_read_tx_timestamp(struct rte_eth_dev *dev,