From patchwork Tue Jun 18 16:16:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 54926 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB3D61C263; Tue, 18 Jun 2019 18:17:06 +0200 (CEST) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id 5A3251C231 for ; Tue, 18 Jun 2019 18:16:55 +0200 (CEST) Received: by mail-pf1-f196.google.com with SMTP id q10so7940105pff.9 for ; Tue, 18 Jun 2019 09:16:55 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=3edZyH+EJmL3Z7zcCvMcOV02ysK4senwuXocRUZ0IKU=; b=rO/mi5FOMIuRsZn1QuAdxx3TduT2QC7u4MdKQUX4Om023ofJTT9rXjTYAMxNflr3QK gEQrLCGtcpfq+0yad/cZ9GbLurlCboOP4EhT0574tOrg6WcHa3f2IM//hEgKGeFyrpJI ocGaqiLiBbmDDf7oteES4LSFRCMiUjHc/0GHapE4O8ULlu+cxH7dhcZGOM9bAq+N3+Ip yIS0n9TiIAKSSg6rJ/TIiKd/7bhM3yUVEYBy4DPj0QNlUmF4DTYNtO1cEKQBiMvjZ2yy jbL9ZuJ2xPp+dEhx85oOCr+gjfdsTTYGT2F/Hhs0DPcNktgrvfxCtz/r5G0ndq6nzGLD Cong== 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:mime-version:content-transfer-encoding; bh=3edZyH+EJmL3Z7zcCvMcOV02ysK4senwuXocRUZ0IKU=; b=ACuPU4XZe1Cxp/E+lEE34nWnE/1wBLvY2S+TzsaZp1feRAmFUTcIdp7mAvMnIaMxbW D9lW3R6qjlJ8th3fltLsk74Z504hXAcN6xtnmFSCOTz1E5niPfoYKv7EDMoPO70MV52g wedFqT6cD8s/dzbmhQNnfgYmV8fn/SBDva4METFuKER9ja9kagqhljt/RUXMXkTW0+7p LD60xct+KxPTOKeIrenx9/NhwtD2exMnjKK1zRRaPi27uVvR+utY26CDIk5uy2X0r9dK UNIpqLQn9LskRk6hLfQnFwUJDka/DTxN2VTXwk4Mc8OTx5lv94BHyXCyMdujq/boGhEF ni2A== X-Gm-Message-State: APjAAAUebRXQz42zuQ5W0OF5LfKHtzbjsfzF9VmhKGNnmTbB11Jiwsx/ N1XFm/FtgN5L6+RR6I8qhIZnYy7kskE= X-Google-Smtp-Source: APXvYqzZomQYMTHB0R7VA6JRFtG1WLe7y9YWgmba/WexUDl5IOhfq5fzd+dgyQhZQJtPWrIGyMJ6RQ== X-Received: by 2002:a65:60d9:: with SMTP id r25mr3415287pgv.228.1560874614153; Tue, 18 Jun 2019 09:16:54 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 3sm15485385pfp.114.2019.06.18.09.16.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 09:16:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 18 Jun 2019 09:16:36 -0700 Message-Id: <20190618161636.23748-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190618161636.23748-1-stephen@networkplumber.org> References: <20190610175155.21374-1-stephen@networkplumber.org> <20190618161636.23748-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 8/8] kni: fix style issues 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" rte_kni does not follow standard style rules. Noticed some extra \ line continuation etc. Signed-off-by: Stephen Hemminger --- lib/librte_kni/rte_kni.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c index e29d0cc7df3c..4828df3ca1e6 100644 --- a/lib/librte_kni/rte_kni.c +++ b/lib/librte_kni/rte_kni.c @@ -59,7 +59,7 @@ struct rte_kni { uint16_t group_id; /**< Group ID of KNI devices */ uint32_t slot_id; /**< KNI pool slot ID */ struct rte_mempool *pktmbuf_pool; /**< pkt mbuf mempool */ - unsigned mbuf_size; /**< mbuf size */ + unsigned int mbuf_size; /**< mbuf size */ const struct rte_memzone *m_tx_q; /**< TX queue memzone */ const struct rte_memzone *m_rx_q; /**< RX queue memzone */ @@ -78,7 +78,7 @@ struct rte_kni { /* For request & response */ struct rte_kni_fifo *req_q; /**< Request queue */ struct rte_kni_fifo *resp_q; /**< Response queue */ - void * sync_addr; /**< Req/Resp Mem address */ + void *sync_addr; /**< Req/Resp Mem address */ struct rte_kni_ops ops; /**< operations for request */ }; @@ -473,7 +473,7 @@ kni_config_promiscusity(uint16_t port_id, uint8_t to_on) int rte_kni_handle_request(struct rte_kni *kni) { - unsigned ret; + unsigned int ret; struct rte_kni_request *req = NULL; if (kni == NULL) @@ -498,8 +498,8 @@ rte_kni_handle_request(struct rte_kni *kni) break; case RTE_KNI_REQ_CFG_NETWORK_IF: /* Set network interface up/down */ if (kni->ops.config_network_if) - req->result = kni->ops.config_network_if(\ - kni->ops.port_id, req->if_up); + req->result = kni->ops.config_network_if(kni->ops.port_id, + req->if_up); break; case RTE_KNI_REQ_CHANGE_MAC_ADDR: /* Change MAC Address */ if (kni->ops.config_mac_address) @@ -534,7 +534,7 @@ rte_kni_handle_request(struct rte_kni *kni) } unsigned -rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num) +rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num) { void *phy_mbufs[num]; unsigned int ret; @@ -552,9 +552,9 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num) } unsigned -rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num) +rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num) { - unsigned ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num); + unsigned int ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num); /* If buffers removed, allocate mbufs and then put them into alloc_q */ if (ret) @@ -605,7 +605,7 @@ kni_allocate_mbufs(struct rte_kni *kni) return; } - allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1) \ + allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1) & (MAX_MBUF_BURST_NUM - 1); for (i = 0; i < allocq_free; i++) { pkts[i] = rte_pktmbuf_alloc(kni->pktmbuf_pool); @@ -659,7 +659,7 @@ static enum kni_ops_status kni_check_request_register(struct rte_kni_ops *ops) { /* check if KNI request ops has been registered*/ - if( NULL == ops ) + if (NULL == ops) return KNI_REQ_NO_REGISTER; if ((ops->change_mtu == NULL) @@ -672,22 +672,22 @@ kni_check_request_register(struct rte_kni_ops *ops) } int -rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops) +rte_kni_register_handlers(struct rte_kni *kni, struct rte_kni_ops *ops) { enum kni_ops_status req_status; - if (NULL == ops) { + if (ops == NULL) { RTE_LOG(ERR, KNI, "Invalid KNI request operation.\n"); return -1; } - if (NULL == kni) { + if (kni == NULL) { RTE_LOG(ERR, KNI, "Invalid kni info.\n"); return -1; } req_status = kni_check_request_register(&kni->ops); - if ( KNI_REQ_REGISTERED == req_status) { + if (req_status == KNI_REQ_REGISTERED) { RTE_LOG(ERR, KNI, "The KNI request operation has already registered.\n"); return -1; } @@ -699,7 +699,7 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops) int rte_kni_unregister_handlers(struct rte_kni *kni) { - if (NULL == kni) { + if (kni == NULL) { RTE_LOG(ERR, KNI, "Invalid kni info.\n"); return -1; }