X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_pmd_pcap%2Frte_eth_pcap.c;h=b3dbbdaa31cec4e9a208672922b397e9561dbb8c;hb=2b730d4f0a3efe03c5b6907182725c09db6cec2d;hp=fbafd19668bb4afccf01719f4c60c5105023c368;hpb=266ffe3494aed907f2dcd76c233ffadde1840518;p=dpdk.git

diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c
index fbafd19668..b3dbbdaa31 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,20 +40,21 @@
 #include <rte_string_fns.h>
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
+#include <rte_dev.h>
 
 #include <net/if.h>
 
-#include "rte_eth_pcap.h"
+#include <pcap.h>
 
 #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535
 #define RTE_ETH_PCAP_SNAPLEN 4096
 #define RTE_ETH_PCAP_PROMISC 1
 #define RTE_ETH_PCAP_TIMEOUT -1
-#define ETH_PCAP_RX_PCAP_ARG  	"rx_pcap"
-#define ETH_PCAP_TX_PCAP_ARG  	"tx_pcap"
-#define ETH_PCAP_RX_IFACE_ARG 	"rx_iface"
-#define ETH_PCAP_TX_IFACE_ARG	"tx_iface"
-#define ETH_PCAP_IFACE_ARG		"iface"
+#define ETH_PCAP_RX_PCAP_ARG  "rx_pcap"
+#define ETH_PCAP_TX_PCAP_ARG  "tx_pcap"
+#define ETH_PCAP_RX_IFACE_ARG "rx_iface"
+#define ETH_PCAP_TX_IFACE_ARG "tx_iface"
+#define ETH_PCAP_IFACE_ARG    "iface"
 
 static char errbuf[PCAP_ERRBUF_SIZE];
 static struct timeval start_time;
@@ -138,7 +139,7 @@ eth_pcap_rx(void *queue,
 		packet = pcap_next(pcap_q->pcap, &header);
 		if (unlikely(packet == NULL))
 			break;
-		else 
+		else
 			mbuf = rte_pktmbuf_alloc(pcap_q->mb_pool);
 		if (unlikely(mbuf == NULL))
 			break;
@@ -157,7 +158,7 @@ eth_pcap_rx(void *queue,
 			num_rx++;
 		} else {
 			/* pcap packet will not fit in the mbuf, so drop packet */
-			RTE_LOG(ERR, PMD, 
+			RTE_LOG(ERR, PMD,
 					"PCAP packet %d bytes will not fit in mbuf (%d bytes)\n",
 					header.len, buf_size);
 			rte_pktmbuf_free(mbuf);
@@ -217,7 +218,6 @@ eth_pcap_tx_dumper(void *queue,
 	return num_tx;
 }
 
-#ifdef PCAP_CAN_SEND
 /*
  * Callback to handle sending packets through a real NIC.
  */
@@ -239,8 +239,9 @@ eth_pcap_tx(void *queue,
 		mbuf = bufs[i];
 		ret = pcap_sendpacket(tx_queue->pcap, (u_char*) mbuf->pkt.data,
 				mbuf->pkt.data_len);
-		if(likely(!ret))
-			num_tx++;
+		if (unlikely(ret != 0))
+			break;
+		num_tx++;
 		rte_pktmbuf_free(mbuf);
 	}
 
@@ -248,17 +249,6 @@ eth_pcap_tx(void *queue,
 	tx_queue->err_pkts += nb_pkts - num_tx;
 	return num_tx;
 }
-#else
-static uint16_t
-eth_pcap_tx(__rte_unused void *queue,
-		__rte_unused struct rte_mbuf **bufs,
-		__rte_unused uint16_t nb_pkts)
-{
-	RTE_LOG(ERR, PMD, "pcap library cannot send packets, please rebuild "
-	                  "with a more up to date libpcap\n");
-	return -1;
-}
-#endif
 
 static int
 eth_dev_start(struct rte_eth_dev *dev)
@@ -697,8 +687,8 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[],
 }
 
 
-int
-rte_pmd_pcap_init(const char *name, const char *params)
+static int
+rte_pmd_pcap_devinit(const char *name, const char *params)
 {
 	unsigned numa_node, using_dumpers = 0;
 	int ret;
@@ -778,3 +768,10 @@ rte_pmd_pcap_init(const char *name, const char *params)
 
 }
 
+static struct rte_driver pmd_pcap_drv = {
+	.name = "eth_pcap",
+	.type = PMD_VDEV,
+	.init = rte_pmd_pcap_devinit,
+};
+
+PMD_REGISTER_DRIVER(pmd_pcap_drv);