From patchwork Sat Jan 7 18:17:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 18994 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 467F5F614; Sat, 7 Jan 2017 19:19:08 +0100 (CET) Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by dpdk.org (Postfix) with ESMTP id 88CA429CF for ; Sat, 7 Jan 2017 19:18:09 +0100 (CET) Received: by mail-pf0-f172.google.com with SMTP id f144so10872961pfa.2 for ; Sat, 07 Jan 2017 10:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mvt3Tavo16H3YEMCbjBY3yooIJgbv8IN/iFStqXSnIU=; b=beOACZHAV03Zskn7Pz2X0pxHDH/xRvd7uWcyu7/1s1D9I9QqFvcUdCfep1GLK+l14k etxBPWd3pgu7dAJzYjPRsxSHedmXdSOVR/kZv89v8VXVEXUnQDo2/EtSRJcWV10uEhKe TSNdzyCtF/7sUEOUitlQomjOW0fEpGdtf22z1cwbUIa9GrjV8XyFRhSggB5qQkBE8yYm AafROXIx0TeaSxkkSz8PbI/Y27tuSHUAqgYFa1ZUH5Zh8GpW6A+WhIBoGn5WAOEIyeqQ iy+j3AZnjYsD5BhjWrxhjO2LZFCWwB2KkqBETwDpREQ66xegAqNNXHLuTd446R/VHl+N WHBw== 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; bh=mvt3Tavo16H3YEMCbjBY3yooIJgbv8IN/iFStqXSnIU=; b=JRbYDPnMYHFUJPiqnyZkQCaGPGICH4tdQrpZp+zzaiKW9NIUdIoT5d7KqSY9uVfviC W73EowjnpCH8pkIaG+VI0poGK/kimZmRUt34f4cLxRR5izCEkEa8LGCn7JCOOesagboL wJiIr5NstLcXWFGqi09o5mQ0Y0ZqDOY3juMzovI3bSEetbPT//b5ukCSeZtF9RYXiOTE BrP0dnBEJdbFhMFEfeN1Dc+axvtwo5AAzuprwxWGWybN9E2UVD5CYcHgeSfe64Dokji3 CvJ/s3AhPQnE6pW8sEXJ7vBdfly4JEa20p+0/wgb8QSGNDKnmIHVzk6MMyPUQAKm8wKX LesQ== X-Gm-Message-State: AIkVDXINb1RW5V4gUW9G481DSP2Q/3QBI56R5Ea2Y8kaZA4CIux2wLdcrQp64a5I1zCvYw== X-Received: by 10.99.116.80 with SMTP id e16mr137864649pgn.135.1483813088391; Sat, 07 Jan 2017 10:18:08 -0800 (PST) Received: from xeon-e3.wavecable.com (204-195-18-65.wavecable.com. [204.195.18.65]) by smtp.gmail.com with ESMTPSA id q190sm127565181pfb.51.2017.01.07.10.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jan 2017 10:18:07 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Sat, 7 Jan 2017 10:17:52 -0800 Message-Id: <20170107181756.1944-5-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170107181756.1944-1-sthemmin@microsoft.com> References: <20170107181756.1944-1-sthemmin@microsoft.com> Subject: [dpdk-dev] [PATCH 4/8] cxgbe: don't refer to eth_dev->pci_dev X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Later patches remove pci_dev from the ethernet device structure. Fix the cxgbe code to just use it's own name when forming zone name. Signed-off-by: Stephen Hemminger --- drivers/net/cxgbe/sge.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c index 736f08ce..e935dc42 100644 --- a/drivers/net/cxgbe/sge.c +++ b/drivers/net/cxgbe/sge.c @@ -1644,8 +1644,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq, /* Size needs to be multiple of 16, including status entry. */ iq->size = cxgbe_roundup(iq->size, 16); - snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d", - eth_dev->driver->pci_drv.driver.name, + snprintf(z_name, sizeof(z_name), "cxgbe_%s_%d_%d", fwevtq ? "fwq_ring" : "rx_ring", eth_dev->data->port_id, queue_id); snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name); @@ -1697,8 +1696,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq, fl->size = s->fl_starve_thres - 1 + 2 * 8; fl->size = cxgbe_roundup(fl->size, 8); - snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d", - eth_dev->driver->pci_drv.driver.name, + snprintf(z_name, sizeof(z_name), "cxgbe_%s_%d_%d", fwevtq ? "fwq_ring" : "fl_ring", eth_dev->data->port_id, queue_id); snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name); @@ -1893,8 +1891,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq, /* Add status entries */ nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc); - snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d", - eth_dev->driver->pci_drv.driver.name, "tx_ring", + snprintf(z_name, sizeof(z_name), "cxgbe_%d_%d", eth_dev->data->port_id, queue_id); snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);