[dpdk-dev] [PATCH] pcap: remove test for PCAP_CAN_SEND

[dpdk-dev] [PATCH] pcap: remove test for PCAP_CAN_SEND

[Neil Horman]

The libpcap library has had the ability to send packets since 2004, theres
really no need to test for it.  Especially in the way dpdk is doing as, as
according to the libpcap git tree pcap_sendpacket has never been a #define, and
dpdk tests for its existance with an #ifdef.  Its easier just to remove the test
entirely

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
---
 lib/librte_pmd_pcap/rte_eth_pcap.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c
index fbafd19..fe94a79 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -217,7 +217,6 @@ eth_pcap_tx_dumper(void *queue,
 	return num_tx;
 }
 
-#ifdef PCAP_CAN_SEND
 /*
  * Callback to handle sending packets through a real NIC.
  */
@@ -248,17 +247,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)
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] pcap: remove test for PCAP_CAN_SEND

[Thomas Monjalon]

Hi Neil,

28/03/2014 21:32, Neil Horman :
> The libpcap library has had the ability to send packets since 2004, theres
> really no need to test for it.  Especially in the way dpdk is doing as, as
> according to the libpcap git tree pcap_sendpacket has never been a #define,
> and dpdk tests for its existance with an #ifdef.  Its easier just to remove
> the test entirely
> 
> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>

A similar patch is already applied on HEAD:
	http://dpdk.org/browse/dpdk/commit/?id=2a315d698510e7b33

-- 
Thomas

Re: [dpdk-dev] [PATCH] pcap: remove test for PCAP_CAN_SEND

[Neil Horman]

On Sat, Mar 29, 2014 at 11:34:46AM +0100, Thomas Monjalon wrote:
> Hi Neil,
> 
> 28/03/2014 21:32, Neil Horman :
> > The libpcap library has had the ability to send packets since 2004, theres
> > really no need to test for it.  Especially in the way dpdk is doing as, as
> > according to the libpcap git tree pcap_sendpacket has never been a #define,
> > and dpdk tests for its existance with an #ifdef.  Its easier just to remove
> > the test entirely
> > 
> > Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
> 
> A similar patch is already applied on HEAD:
> 	http://dpdk.org/browse/dpdk/commit/?id=2a315d698510e7b33
> 
My bad, thanks!
Neil

> -- 
> Thomas
>