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 AA240A046B for ; Mon, 24 Jun 2019 17:25:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C5EC1BE1E; Mon, 24 Jun 2019 17:25:51 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6A5DF1BE1E for ; Mon, 24 Jun 2019 17:25:49 +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 B4DBF36899; Mon, 24 Jun 2019 15:25:48 +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 A207419C69; Mon, 24 Jun 2019 15:25:47 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:27 +0100 Message-Id: <20190624152525.19349-3-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:48 +0000 (UTC) Subject: [dpdk-stable] patch 'net/axgbe: 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/be890a6b9f0fe2aa6c11ab78897b819fcca8047e Thanks. Kevin Traynor --- >From be890a6b9f0fe2aa6c11ab78897b819fcca8047e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 29 May 2019 12:14:52 -0700 Subject: [PATCH] net/axgbe: remove unnecessary cast [ upstream commit 0bc212a8ae76324c038cd3110f3a92488264f45d ] 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/axgbe/axgbe_ethdev.c | 24 +++++++++++++++--------- drivers/net/axgbe/axgbe_rxtx.c | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index e89c0ec2c..2f34ad80c 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -158,5 +158,5 @@ static int axgbe_dev_rx_mq_config(struct rte_eth_dev *dev) { - struct axgbe_port *pdata = (struct axgbe_port *)dev->data->dev_private; + struct axgbe_port *pdata = dev->data->dev_private; if (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_RSS) @@ -172,8 +172,9 @@ static int axgbe_dev_start(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); - struct axgbe_port *pdata = (struct axgbe_port *)dev->data->dev_private; + struct axgbe_port *pdata = dev->data->dev_private; int ret; + PMD_INIT_FUNC_TRACE(); + /* Multiqueue RSS */ ret = axgbe_dev_rx_mq_config(dev); @@ -210,7 +211,8 @@ static void axgbe_dev_stop(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); struct axgbe_port *pdata = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); + rte_intr_disable(&pdata->pci_dev->intr_handle); @@ -238,7 +240,8 @@ static void axgbe_dev_promiscuous_enable(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); struct axgbe_port *pdata = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); + AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1); } @@ -247,7 +250,8 @@ static void axgbe_dev_promiscuous_disable(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); struct axgbe_port *pdata = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); + AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0); } @@ -256,7 +260,8 @@ static void axgbe_dev_allmulticast_enable(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); struct axgbe_port *pdata = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); + if (AXGMAC_IOREAD_BITS(pdata, MAC_PFR, PM)) return; @@ -267,7 +272,8 @@ static void axgbe_dev_allmulticast_disable(struct rte_eth_dev *dev) { - PMD_INIT_FUNC_TRACE(); struct axgbe_port *pdata = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); + if (!AXGMAC_IOREAD_BITS(pdata, MAC_PFR, PM)) return; @@ -579,5 +585,5 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) return 0; - pdata = (struct axgbe_port *)eth_dev->data->dev_private; + pdata = eth_dev->data->dev_private; /* initial state */ axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state); diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index b5a29a95f..d80f378c7 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -343,5 +343,5 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, tx_desc = nb_desc; - pdata = (struct axgbe_port *)dev->data->dev_private; + pdata = dev->data->dev_private; /* -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.261907672 +0100 +++ 0003-net-axgbe-remove-unnecessary-cast.patch 2019-06-24 16:18:54.929433631 +0100 @@ -1 +1 @@ -From 0bc212a8ae76324c038cd3110f3a92488264f45d Mon Sep 17 00:00:00 2001 +From be890a6b9f0fe2aa6c11ab78897b819fcca8047e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0bc212a8ae76324c038cd3110f3a92488264f45d ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -19 +19 @@ -index 221979c5e..6b3bc3eea 100644 +index e89c0ec2c..2f34ad80c 100644 @@ -99 +99 @@ -index e76601d14..cfc55b359 100644 +index b5a29a95f..d80f378c7 100644