kni: fix style

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>

diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 06310fe..320d51d 100644 (file)
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -401,7 +401,7 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
        /* Get the number of entries in rx_q */
        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);
 
        /* Get the number of entries in alloc_q */
@@ -755,6 +755,7 @@ kni_net_config_lo_mode(char *lo_str)
        } else if (!strcmp(lo_str, "lo_mode_fifo_skb")) {
                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 9dd5ebe..1de053d 100644 (file)
--- 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 */
 };
@@ -478,7 +478,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)
@@ -503,8 +503,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)
@@ -539,7 +539,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;
@@ -557,9 +557,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)
@@ -610,7 +610,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);
@@ -664,35 +664,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;
        }
@@ -704,7 +704,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;
        }