{"id":811564,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811564/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504873725-30180-1-git-send-email-yanjun.zhu@oracle.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504873725-30180-1-git-send-email-yanjun.zhu@oracle.com>","list_archive_url":null,"date":"2017-09-08T12:28:45","name":"[1/1] forcedeth: remove tx_stop variable","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"dbe7b07b4a99cb00712b1390854a29ca8dc629e1","submitter":{"id":70718,"url":"http://patchwork.ozlabs.org/api/1.2/people/70718/?format=json","name":"Zhu Yanjun","email":"yanjun.zhu@oracle.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504873725-30180-1-git-send-email-yanjun.zhu@oracle.com/mbox/","series":[{"id":2195,"url":"http://patchwork.ozlabs.org/api/1.2/series/2195/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=2195","date":"2017-09-08T12:28:45","name":"[1/1] forcedeth: remove tx_stop variable","version":1,"mbox":"http://patchwork.ozlabs.org/series/2195/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811564/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811564/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xpcMZ2LBkz9sRW\n\tfor ;\n\tFri, 8 Sep 2017 22:39:22 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755509AbdIHM0W (ORCPT );\n\tFri, 8 Sep 2017 08:26:22 -0400","from aserp1040.oracle.com ([141.146.126.69]:50440 \"EHLO\n\taserp1040.oracle.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754986AbdIHM0V (ORCPT\n\t); Fri, 8 Sep 2017 08:26:21 -0400","from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233])\n\tby aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2)\n\twith ESMTP id v88CQJJk006945\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Fri, 8 Sep 2017 12:26:20 GMT","from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75])\n\tby aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v88CQJAJ014324\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Fri, 8 Sep 2017 12:26:19 GMT","from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16])\n\tby userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id\n\tv88CQJdW003380; Fri, 8 Sep 2017 12:26:19 GMT","from office-bj2017.cn.oracle.com (/10.182.69.186)\n\tby default (Oracle Beehive Gateway v4.0)\n\twith ESMTP ; Fri, 08 Sep 2017 05:26:18 -0700"],"From":"Zhu Yanjun ","To":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 1/1] forcedeth: remove tx_stop variable","Date":"Fri, 8 Sep 2017 08:28:45 -0400","Message-Id":"<1504873725-30180-1-git-send-email-yanjun.zhu@oracle.com>","X-Mailer":"git-send-email 2.7.4","X-Source-IP":"aserv0021.oracle.com [141.146.126.233]","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The variable tx_stop is used to indicate the tx queue state: started\nor stopped. In fact, the inline function netif_queue_stopped can do\nthe same work. So replace the variable tx_stop with the\nfunction netif_queue_stopped.\n\nSigned-off-by: Zhu Yanjun \n---\n drivers/net/ethernet/nvidia/forcedeth.c | 13 ++++---------\n 1 file changed, 4 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c\nindex 994a83a..e6e0de4 100644\n--- a/drivers/net/ethernet/nvidia/forcedeth.c\n+++ b/drivers/net/ethernet/nvidia/forcedeth.c\n@@ -834,7 +834,6 @@ struct fe_priv {\n \tu32 tx_pkts_in_progress;\n \tstruct nv_skb_map *tx_change_owner;\n \tstruct nv_skb_map *tx_end_flip;\n-\tint tx_stop;\n \n \t/* TX software stats */\n \tstruct u64_stats_sync swstats_tx_syncp;\n@@ -1939,7 +1938,6 @@ static void nv_init_tx(struct net_device *dev)\n \tnp->tx_pkts_in_progress = 0;\n \tnp->tx_change_owner = NULL;\n \tnp->tx_end_flip = NULL;\n-\tnp->tx_stop = 0;\n \n \tfor (i = 0; i < np->tx_ring_size; i++) {\n \t\tif (!nv_optimized(np)) {\n@@ -2211,7 +2209,6 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)\n \tempty_slots = nv_get_empty_tx_slots(np);\n \tif (unlikely(empty_slots <= entries)) {\n \t\tnetif_stop_queue(dev);\n-\t\tnp->tx_stop = 1;\n \t\tspin_unlock_irqrestore(&np->lock, flags);\n \t\treturn NETDEV_TX_BUSY;\n \t}\n@@ -2359,7 +2356,6 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,\n \tempty_slots = nv_get_empty_tx_slots(np);\n \tif (unlikely(empty_slots <= entries)) {\n \t\tnetif_stop_queue(dev);\n-\t\tnp->tx_stop = 1;\n \t\tspin_unlock_irqrestore(&np->lock, flags);\n \t\treturn NETDEV_TX_BUSY;\n \t}\n@@ -2583,8 +2579,8 @@ static int nv_tx_done(struct net_device *dev, int limit)\n \n \tnetdev_completed_queue(np->dev, tx_work, bytes_compl);\n \n-\tif (unlikely((np->tx_stop == 1) && (np->get_tx.orig != orig_get_tx))) {\n-\t\tnp->tx_stop = 0;\n+\tif (unlikely(netif_queue_stopped(dev) &&\n+\t\t (np->get_tx.orig != orig_get_tx))) {\n \t\tnetif_wake_queue(dev);\n \t}\n \treturn tx_work;\n@@ -2637,8 +2633,8 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)\n \n \tnetdev_completed_queue(np->dev, tx_work, bytes_cleaned);\n \n-\tif (unlikely((np->tx_stop == 1) && (np->get_tx.ex != orig_get_tx))) {\n-\t\tnp->tx_stop = 0;\n+\tif (unlikely(netif_queue_stopped(dev) &&\n+\t\t (np->get_tx.ex != orig_get_tx))) {\n \t\tnetif_wake_queue(dev);\n \t}\n \treturn tx_work;\n@@ -2724,7 +2720,6 @@ static void nv_tx_timeout(struct net_device *dev)\n \t/* 2) complete any outstanding tx and do not give HW any limited tx pkts */\n \tsaved_tx_limit = np->tx_limit;\n \tnp->tx_limit = 0; /* prevent giving HW any limited pkts */\n-\tnp->tx_stop = 0; /* prevent waking tx queue */\n \tif (!nv_optimized(np))\n \t\tnv_tx_done(dev, np->tx_ring_size);\n \telse\n","prefixes":["1/1"]}