[dpdk-stable] patch 'kni: fix style' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/03/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c20b7cf82bd9fd5723917e1a4497410a98e61174

Thanks.

Kevin Traynor

---
From c20b7cf82bd9fd5723917e1a4497410a98e61174 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 24 Jun 2019 09:47:12 -0700
Subject: [PATCH] kni: fix style

[ upstream commit dbb69b7b648f960ee0b3532225b7e17b998f4edf ]

rte_kni does not follow standard style rules.
Noticed some extra \ line continuation etc.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 kernel/linux/kni/kni_net.c |  7 ++++---
 lib/librte_kni/rte_kni.c   | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 7371b6d58..0be1517f0 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -405,5 +405,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
 	num_rq = kni_fifo_count(kni->rx_q);
 
-	/* Get the number of free entrie in tx_q */
+	/* Get the number of free entries in tx_q */
 	num_tq = kni_fifo_free_count(kni->tx_q);
 
@@ -798,5 +798,6 @@ kni_net_config_lo_mode(char *lo_str)
 		pr_debug("loopback mode=lo_mode_fifo_skb enabled");
 		kni_net_rx_func = kni_net_rx_lo_fifo_skb;
-	} else
-		pr_debug("Incognizant parameter, loopback disabled");
+	} else {
+		pr_debug("Unknown loopback parameter, disabled");
+	}
 }
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 99b6c3e13..2721afdf8 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -60,5 +60,5 @@ struct rte_kni {
 	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 */
@@ -79,5 +79,5 @@ struct rte_kni {
 	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 */
@@ -488,5 +488,5 @@ int
 rte_kni_handle_request(struct rte_kni *kni)
 {
-	unsigned ret;
+	unsigned int ret;
 	struct rte_kni_request *req = NULL;
 
@@ -513,6 +513,6 @@ rte_kni_handle_request(struct rte_kni *kni)
 	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 */
@@ -549,5 +549,5 @@ 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];
@@ -567,7 +567,7 @@ 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 */
@@ -620,5 +620,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
 	}
 
-	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++) {
@@ -674,11 +674,11 @@ 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;
 
@@ -687,14 +687,14 @@ 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;
@@ -702,5 +702,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
 
 	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;
@@ -714,5 +714,5 @@ 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

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.365867901 +0100
+++ 0045-kni-fix-style.patch	2019-08-27 09:40:10.944143805 +0100
@@ -1 +1 @@
-From dbb69b7b648f960ee0b3532225b7e17b998f4edf Mon Sep 17 00:00:00 2001
+From c20b7cf82bd9fd5723917e1a4497410a98e61174 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dbb69b7b648f960ee0b3532225b7e17b998f4edf ]
+
@@ -17 +19 @@
-index 06310fec5..320d51d7f 100644
+index 7371b6d58..0be1517f0 100644
@@ -20 +22 @@
-@@ -402,5 +402,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
+@@ -405,5 +405,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
@@ -27 +29 @@
-@@ -756,5 +756,6 @@ kni_net_config_lo_mode(char *lo_str)
+@@ -798,5 +798,6 @@ kni_net_config_lo_mode(char *lo_str)
@@ -37 +39 @@
-index 9dd5ebe0e..1de053deb 100644
+index 99b6c3e13..2721afdf8 100644
@@ -54 +56 @@
-@@ -479,5 +479,5 @@ int
+@@ -488,5 +488,5 @@ int
@@ -61 +63 @@
-@@ -504,6 +504,6 @@ rte_kni_handle_request(struct rte_kni *kni)
+@@ -513,6 +513,6 @@ rte_kni_handle_request(struct rte_kni *kni)
@@ -70 +72 @@
-@@ -540,5 +540,5 @@ rte_kni_handle_request(struct rte_kni *kni)
+@@ -549,5 +549,5 @@ rte_kni_handle_request(struct rte_kni *kni)
@@ -77 +79 @@
-@@ -558,7 +558,7 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+@@ -567,7 +567,7 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
@@ -87 +89 @@
-@@ -611,5 +611,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
+@@ -620,5 +620,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
@@ -94 +96 @@
-@@ -665,11 +665,11 @@ kni_check_request_register(struct rte_kni_ops *ops)
+@@ -674,11 +674,11 @@ kni_check_request_register(struct rte_kni_ops *ops)
@@ -111 +113 @@
-@@ -678,14 +678,14 @@ kni_check_request_register(struct rte_kni_ops *ops)
+@@ -687,14 +687,14 @@ kni_check_request_register(struct rte_kni_ops *ops)
@@ -129 +131 @@
-@@ -693,5 +693,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
+@@ -702,5 +702,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
@@ -136 +138 @@
-@@ -705,5 +705,5 @@ int
+@@ -714,5 +714,5 @@ int