update Intel copyright years to 2014

[dpdk.git] / lib / librte_eal / linuxapp / kni / kni_net.c

diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c
index 2e27663..4616ac4 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_net.c
+++ b/lib/librte_eal/linuxapp/kni/kni_net.c
@@ -1,7 +1,7 @@
 /*-
  * GPL LICENSE SUMMARY
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  * 
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -38,6 +38,7 @@
 
 #include <rte_config.h>
 #include <exec-env/rte_kni_common.h>
+#include <kni_fifo.h>
 #include "kni_dev.h"
 
 #define WD_TIMEOUT 5 /*jiffies */
@@ -59,68 +60,6 @@ static int kni_net_process_request(struct kni_dev *kni,
 /* kni rx function pointer, with default to normal rx */
 static kni_net_rx_t kni_net_rx_func = kni_net_rx_normal;
 
-
-/**
- * Adds num elements into the fifo. Return the number actually written
- */
-static inline unsigned
-kni_fifo_put(struct rte_kni_fifo *fifo, void **data, unsigned num)
-{
-       unsigned i = 0;
-       unsigned fifo_write = fifo->write;
-       unsigned fifo_read = fifo->read;
-       unsigned new_write = fifo_write;
-
-       for (i = 0; i < num; i++) {
-               new_write = (new_write + 1) & (fifo->len - 1);
-
-               if (new_write == fifo_read)
-                       break;
-               fifo->buffer[fifo_write] = data[i];
-               fifo_write = new_write;
-       }
-       fifo->write = fifo_write;
-       return i;
-}
-
-/**
- * Get up to num elements from the fifo. Return the number actully read
- */
-static inline unsigned
-kni_fifo_get(struct rte_kni_fifo *fifo, void **data, unsigned num)
-{
-       unsigned i = 0;
-       unsigned new_read = fifo->read;
-       unsigned fifo_write = fifo->write;
-       for (i = 0; i < num; i++) {
-               if (new_read == fifo_write)
-                       break;
-
-               data[i] = fifo->buffer[new_read];
-               new_read = (new_read + 1) & (fifo->len - 1);
-       }
-       fifo->read = new_read;
-       return i;
-}
-
-/**
- * Get the num of elements in the fifo
- */
-static inline unsigned
-kni_fifo_count(struct rte_kni_fifo *fifo)
-{
-       return (fifo->len + fifo->write - fifo->read) &( fifo->len - 1);
-}
-
-/**
- * Get the num of available lements in the fifo
- */
-static inline unsigned
-kni_fifo_free_count(struct rte_kni_fifo *fifo)
-{
-       return (fifo->read - fifo->write - 1) & (fifo->len - 1);
-}
-
 /*
  * Open and close
  */
@@ -440,6 +379,18 @@ kni_net_rx(struct kni_dev *kni)
 /*
  * Transmit a packet (called by the kernel)
  */
+#ifdef RTE_KNI_VHOST
+static int
+kni_net_tx(struct sk_buff *skb, struct net_device *dev)
+{
+       struct kni_dev *kni = netdev_priv(dev);
+       
+       dev_kfree_skb(skb);
+       kni->stats.tx_dropped++;
+       
+       return NETDEV_TX_OK;
+}
+#else
 static int
 kni_net_tx(struct sk_buff *skb, struct net_device *dev)
 {
@@ -512,6 +463,7 @@ drop:
 
        return NETDEV_TX_OK;
 }
+#endif
 
 /*
  * Deal with a transmit timeout.
@@ -535,8 +487,8 @@ kni_net_tx_timeout (struct net_device *dev)
 static int
 kni_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       struct kni_dev *kni = netdev_priv(dev);
-       KNI_DBG("kni_net_ioctl %d\n", kni->port_id);
+       KNI_DBG("kni_net_ioctl %d\n",
+               ((struct kni_dev *)netdev_priv(dev))->group_id);
 
        return 0;
 }