From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id AD4ECA0471
for <public@inbox.dpdk.org>; Wed, 19 Jun 2019 20:59:22 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 218F41D14E;
Wed, 19 Jun 2019 20:58:19 +0200 (CEST)
Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com
[209.85.214.196]) by dpdk.org (Postfix) with ESMTP id ACC501D0FE
for <dev@dpdk.org>; Wed, 19 Jun 2019 20:58:05 +0200 (CEST)
Received: by mail-pl1-f196.google.com with SMTP id i2so203930plt.1
for <dev@dpdk.org>; Wed, 19 Jun 2019 11:58:05 -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=61Tz9e51iFsr64UJR+4GBKGdoy7QED4nKBXU34vTxeM=;
b=jrih7eR2+RX3bunEg0yfKdKQOynrGr8a3l+0YQmT4y6DFPbyW5qY6Qs4IKq6tEo+Ym
f+P8IqzWpoX3u3CFy6wJuM5neORAvdx22bVJ3nfd9DqcvoDNfh+m+47p2rKmVCOa5vNQ
xVweopKiY05wIvME2PgZzhgMBk/OGQ2yE/DcyB6DOadYElXdRpY/uXXdXC6hvC+z/74r
WuME1j8kQ7VZ4SxhjCTaSFpVwUT8bZpm7QomRhHEQvxlW0qA6VdfN3eYZ8F4gFKu3M5X
RxTlCHH8/jUST+204rPCTye2JXffrb4cOtlRjesZq30jOZATZ3Nx1U0IahCfln2cgAho
qZQQ==
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=61Tz9e51iFsr64UJR+4GBKGdoy7QED4nKBXU34vTxeM=;
b=TKpi+7kbtuFJZJNzmR2THXEjjqYJREVKwSl+8mwuOPexTn3Y692NJoyFDKzocRQrzD
mGA2k4wno96Q+//UTI3vyfB5MxY+4B5wn0B5KfAU1VeIR6wPPTkZUwUPPL66FXhO+rSh
NAk6+ii7DeajIKGkweywCa5ccJCqKwe8rAemT2jD0nKCz2dDFj9KdieUGifSU4wZKGFy
6eYlMiOaBu4zpVE3rMbC2ZFBPVN0iWB6QJosiVnh7cin7fWkDeMqUeKatwW7aE1QUGPy
N/LPxHtUFbLxMrgubDg3920aTwMqzsi/nh8uU0Umpq9Q/+7VCdgBlnOXKy+nMPCDDUvQ
+xHw==
X-Gm-Message-State: APjAAAV8fKtq3wQMvGChYlqZ3xLvh+T0lD7K+e6u6VF+Li09Ugv43Nkh
SD+nMl0M3+BZ+cDeq7FZbt4XRnsuXkY=
X-Google-Smtp-Source: APXvYqwsGYWg3o53QDbFrPfchLgt6MZe0gnw4RbIkqDTXe58S8mFbLGYWBxO4tHCUq2aGtLYXhTleQ==
X-Received: by 2002:a17:902:27e6:: with SMTP id
i35mr119944944plg.190.1560970684681;
Wed, 19 Jun 2019 11:58:04 -0700 (PDT)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id b8sm24774858pff.20.2019.06.19.11.58.03
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
Wed, 19 Jun 2019 11:58:03 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 19 Jun 2019 11:57:46 -0700
Message-Id: <20190619185746.26866-9-stephen@networkplumber.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190619185746.26866-1-stephen@networkplumber.org>
References: <20190610175155.21374-1-stephen@networkplumber.org>
<20190619185746.26866-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Stephen Hemminger <sthemmin@microsoft.com>
rte_kni does not follow standard style rules.
Noticed some extra \ line continuation etc.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_kni/rte_kni.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index e29d0cc7df3c..9b6acc382fc3 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,35 +659,35 @@ 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 (ops == NULL)
return KNI_REQ_NO_REGISTER;
- if ((ops->change_mtu == NULL)
- && (ops->config_network_if == NULL)
- && (ops->config_mac_address == NULL)
- && (ops->config_promiscusity == NULL))
+ if (ops->change_mtu == NULL
+ && ops->config_network_if == NULL
+ && ops->config_mac_address == NULL
+ && ops->config_promiscusity == NULL)
return KNI_REQ_NO_REGISTER;
return KNI_REQ_REGISTERED;
}
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;
}
--
2.20.1