From patchwork Mon Jan 2 23:08:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 18766 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 31405F610; Tue, 3 Jan 2017 00:09:44 +0100 (CET) Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by dpdk.org (Postfix) with ESMTP id 401732BA5 for ; Tue, 3 Jan 2017 00:09:03 +0100 (CET) Received: by mail-pg0-f50.google.com with SMTP id g1so168553169pgn.0 for ; Mon, 02 Jan 2017 15:09:03 -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=yNg8BHV7ffGgtGY5tISgpsCBpwgJUifZh4cCCB8ZvlY=; b=BDlIxqr+66x8gyfcS8Y89RqUOnjvJ5l562hjQR9diddvYtg52Ravhc+4x12yqJ1JI4 9A5rbJ7ZvRv66vpwRH7xbhHPortXAv/dQ2np879ozw7znrmXllUe6Gh/RORZ66HTiFNW VYgJ7ppGTwCvSHAKHWkgsxlDNsRU6A8z0WMTfqU3EK/q83H1sPoRWwL+arjSJI+RYVr1 +4eaJBg8oYLKjChFY1GIgv3bGDuWGCisSIwERn80WMxhYBe22FsWiQqrw7JPGzTol8UX ytTyczW6dYzg+oulgc+FzNsmMUDOh+E32+zkDpuZvAwGpRFhVcXoGxCO6wG3tMkdsIVe YpWg== 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=yNg8BHV7ffGgtGY5tISgpsCBpwgJUifZh4cCCB8ZvlY=; b=S4RPitansSMJzoGPe/DgnuRoNbzQowF0g6zOvzFvWGgORNoRZ/HdQUsLc4S+GTQ/bQ 3DM5BpSNqFs1IB/TE7Ad7iTxXwMgtadOpEDSvmBSaFNH6GpB8Fv4T8JnpnBcFk2kBqNt Z4fQDC+W6ZMd/lhh6/6x5B/aIeuyB9ZeJ9YxLZ7MhLLqmTOpgqjJKjmPbqWF/gOyiWqc 3sCR6gCk31d7f2e85Slf0lgb5LBUbi1gM6aE7w3Nk6iiABXR+lKcWNXDrY6Kp/DlNrg9 qyLuMAHuq8s0Qk19WZoav6LNzTZr4ymdl4FAHNBY2bJDA78aEa+0VlWu5Z6ILj5Ep0v9 3xcw== X-Gm-Message-State: AIkVDXIASze03qHkN/S1EdMaRcW2gXStEFQLDBH/n6EkAeMDDWeN5tA5uwjSJm3Q87AqXA== X-Received: by 10.99.217.81 with SMTP id e17mr110837039pgj.127.1483398542236; Mon, 02 Jan 2017 15:09:02 -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 p68sm134628284pfd.11.2017.01.02.15.09.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2017 15:09:01 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 2 Jan 2017 15:08:48 -0800 Message-Id: <20170102230850.32610-5-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170102230850.32610-1-sthemmin@microsoft.com> References: <20170102230850.32610-1-sthemmin@microsoft.com> Subject: [dpdk-dev] [PATCH 4/6] 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_tx_ring_%d_%d", eth_dev->data->port_id, queue_id); snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);