diff mbox

[1/2] linux-generic: remove odp_packet_netmap.h

Message ID 1413981601-13557-2-git-send-email-anders.roxell@linaro.org
State Accepted
Commit 361273f1d9a4a83e9d5d89414ad3e9b011b9c2d3
Headers show

Commit Message

Anders Roxell Oct. 22, 2014, 12:40 p.m. UTC 
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 platform/linux-generic/include/odp_packet_netmap.h | 67 ----------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h

Comments

Ciprian Barbu Oct. 22, 2014, 2:29 p.m. UTC | #1 
On Wed, Oct 22, 2014 at 3:40 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

It's trivial but I tested it anyway. You can add me as reviewer.

> ---
>  platform/linux-generic/include/odp_packet_netmap.h | 67 ----------------------
>  1 file changed, 67 deletions(-)
>  delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h
>
> diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h
> deleted file mode 100644
> index 1ab50d0..0000000
> --- a/platform/linux-generic/include/odp_packet_netmap.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/* Copyright (c) 2013, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:     BSD-3-Clause
> - */
> -
> -#ifndef ODP_PACKET_NETMAP_H
> -#define ODP_PACKET_NETMAP_H
> -
> -#include <stdint.h>
> -
> -#include <net/if.h>
> -#include <net/netmap.h>
> -#include <net/netmap_user.h>
> -
> -#include <odp_align.h>
> -#include <odp_debug.h>
> -#include <odp_buffer_pool.h>
> -#include <odp_packet.h>
> -
> -#include <odp_pktio_netmap.h>
> -
> -#define ODP_NETMAP_MODE_HW     0
> -#define ODP_NETMAP_MODE_SW     1
> -
> -#define NETMAP_BLOCKING_IO
> -
> -/** Packet socket using netmap mmaped rings for both Rx and Tx */
> -typedef struct {
> -       odp_buffer_pool_t pool;
> -       size_t max_frame_len; /**< max frame len = buf_size - sizeof(pkt_hdr) */
> -       size_t frame_offset; /**< frame start offset from start of pkt buf */
> -       size_t buf_size; /**< size of buffer payload in 'pool' */
> -       int netmap_mode;
> -       struct nm_desc_t *nm_desc;
> -       uint32_t begin;
> -       uint32_t end;
> -       struct netmap_ring *rxring;
> -       struct netmap_ring *txring;
> -       odp_queue_t tx_access; /* Used for exclusive access to send packets */
> -       uint32_t if_flags;
> -       char ifname[32];
> -} pkt_netmap_t;
> -
> -/**
> - * Configure an interface to work in netmap mode
> - */
> -int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev,
> -                    odp_buffer_pool_t pool, netmap_params_t *nm_params);
> -
> -/**
> - * Switch interface from netmap mode to normal mode
> - */
> -int close_pkt_netmap(pkt_netmap_t * const pkt_nm);
> -
> -/**
> - * Receive packets using netmap
> - */
> -int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
> -                   unsigned len);
> -
> -/**
> - * Send packets using netmap
> - */
> -int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
> -                   unsigned len);
> -#endif
> --
> 2.1.0
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
Ciprian Barbu Oct. 23, 2014, 11:24 a.m. UTC | #2 
On Wed, Oct 22, 2014 at 3:40 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Reviewed-by: Ciprian Barbu <ciprian.barbu@linaro.org>

> ---
>  platform/linux-generic/include/odp_packet_netmap.h | 67 ----------------------
>  1 file changed, 67 deletions(-)
>  delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h
>
> diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h
> deleted file mode 100644
> index 1ab50d0..0000000
> --- a/platform/linux-generic/include/odp_packet_netmap.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/* Copyright (c) 2013, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:     BSD-3-Clause
> - */
> -
> -#ifndef ODP_PACKET_NETMAP_H
> -#define ODP_PACKET_NETMAP_H
> -
> -#include <stdint.h>
> -
> -#include <net/if.h>
> -#include <net/netmap.h>
> -#include <net/netmap_user.h>
> -
> -#include <odp_align.h>
> -#include <odp_debug.h>
> -#include <odp_buffer_pool.h>
> -#include <odp_packet.h>
> -
> -#include <odp_pktio_netmap.h>
> -
> -#define ODP_NETMAP_MODE_HW     0
> -#define ODP_NETMAP_MODE_SW     1
> -
> -#define NETMAP_BLOCKING_IO
> -
> -/** Packet socket using netmap mmaped rings for both Rx and Tx */
> -typedef struct {
> -       odp_buffer_pool_t pool;
> -       size_t max_frame_len; /**< max frame len = buf_size - sizeof(pkt_hdr) */
> -       size_t frame_offset; /**< frame start offset from start of pkt buf */
> -       size_t buf_size; /**< size of buffer payload in 'pool' */
> -       int netmap_mode;
> -       struct nm_desc_t *nm_desc;
> -       uint32_t begin;
> -       uint32_t end;
> -       struct netmap_ring *rxring;
> -       struct netmap_ring *txring;
> -       odp_queue_t tx_access; /* Used for exclusive access to send packets */
> -       uint32_t if_flags;
> -       char ifname[32];
> -} pkt_netmap_t;
> -
> -/**
> - * Configure an interface to work in netmap mode
> - */
> -int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev,
> -                    odp_buffer_pool_t pool, netmap_params_t *nm_params);
> -
> -/**
> - * Switch interface from netmap mode to normal mode
> - */
> -int close_pkt_netmap(pkt_netmap_t * const pkt_nm);
> -
> -/**
> - * Receive packets using netmap
> - */
> -int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
> -                   unsigned len);
> -
> -/**
> - * Send packets using netmap
> - */
> -int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
> -                   unsigned len);
> -#endif
> --
> 2.1.0
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
Anders Roxell Oct. 27, 2014, 9:16 a.m. UTC | #3 
ping

On 23 October 2014 13:24, Ciprian Barbu <ciprian.barbu@linaro.org> wrote:

> On Wed, Oct 22, 2014 at 3:40 PM, Anders Roxell <anders.roxell@linaro.org>
> wrote:
> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
>
> Reviewed-by: Ciprian Barbu <ciprian.barbu@linaro.org>
>
> > ---
> >  platform/linux-generic/include/odp_packet_netmap.h | 67
> ----------------------
> >  1 file changed, 67 deletions(-)
> >  delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h
> >
> > diff --git a/platform/linux-generic/include/odp_packet_netmap.h
> b/platform/linux-generic/include/odp_packet_netmap.h
> > deleted file mode 100644
> > index 1ab50d0..0000000
> > --- a/platform/linux-generic/include/odp_packet_netmap.h
> > +++ /dev/null
> > @@ -1,67 +0,0 @@
> > -/* Copyright (c) 2013, Linaro Limited
> > - * All rights reserved.
> > - *
> > - * SPDX-License-Identifier:     BSD-3-Clause
> > - */
> > -
> > -#ifndef ODP_PACKET_NETMAP_H
> > -#define ODP_PACKET_NETMAP_H
> > -
> > -#include <stdint.h>
> > -
> > -#include <net/if.h>
> > -#include <net/netmap.h>
> > -#include <net/netmap_user.h>
> > -
> > -#include <odp_align.h>
> > -#include <odp_debug.h>
> > -#include <odp_buffer_pool.h>
> > -#include <odp_packet.h>
> > -
> > -#include <odp_pktio_netmap.h>
> > -
> > -#define ODP_NETMAP_MODE_HW     0
> > -#define ODP_NETMAP_MODE_SW     1
> > -
> > -#define NETMAP_BLOCKING_IO
> > -
> > -/** Packet socket using netmap mmaped rings for both Rx and Tx */
> > -typedef struct {
> > -       odp_buffer_pool_t pool;
> > -       size_t max_frame_len; /**< max frame len = buf_size -
> sizeof(pkt_hdr) */
> > -       size_t frame_offset; /**< frame start offset from start of pkt
> buf */
> > -       size_t buf_size; /**< size of buffer payload in 'pool' */
> > -       int netmap_mode;
> > -       struct nm_desc_t *nm_desc;
> > -       uint32_t begin;
> > -       uint32_t end;
> > -       struct netmap_ring *rxring;
> > -       struct netmap_ring *txring;
> > -       odp_queue_t tx_access; /* Used for exclusive access to send
> packets */
> > -       uint32_t if_flags;
> > -       char ifname[32];
> > -} pkt_netmap_t;
> > -
> > -/**
> > - * Configure an interface to work in netmap mode
> > - */
> > -int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev,
> > -                    odp_buffer_pool_t pool, netmap_params_t *nm_params);
> > -
> > -/**
> > - * Switch interface from netmap mode to normal mode
> > - */
> > -int close_pkt_netmap(pkt_netmap_t * const pkt_nm);
> > -
> > -/**
> > - * Receive packets using netmap
> > - */
> > -int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t
> pkt_table[],
> > -                   unsigned len);
> > -
> > -/**
> > - * Send packets using netmap
> > - */
> > -int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t
> pkt_table[],
> > -                   unsigned len);
> > -#endif
> > --
> > 2.1.0
> >
> >
> > _______________________________________________
> > lng-odp mailing list
> > lng-odp@lists.linaro.org
> > http://lists.linaro.org/mailman/listinfo/lng-odp
>
diff mbox

Patch

diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h
deleted file mode 100644
index 1ab50d0..0000000
--- a/platform/linux-generic/include/odp_packet_netmap.h
+++ /dev/null
@@ -1,67 +0,0 @@ 
-/* Copyright (c) 2013, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-#ifndef ODP_PACKET_NETMAP_H
-#define ODP_PACKET_NETMAP_H
-
-#include <stdint.h>
-
-#include <net/if.h>
-#include <net/netmap.h>
-#include <net/netmap_user.h>
-
-#include <odp_align.h>
-#include <odp_debug.h>
-#include <odp_buffer_pool.h>
-#include <odp_packet.h>
-
-#include <odp_pktio_netmap.h>
-
-#define ODP_NETMAP_MODE_HW	0
-#define ODP_NETMAP_MODE_SW	1
-
-#define NETMAP_BLOCKING_IO
-
-/** Packet socket using netmap mmaped rings for both Rx and Tx */
-typedef struct {
-	odp_buffer_pool_t pool;
-	size_t max_frame_len; /**< max frame len = buf_size - sizeof(pkt_hdr) */
-	size_t frame_offset; /**< frame start offset from start of pkt buf */
-	size_t buf_size; /**< size of buffer payload in 'pool' */
-	int netmap_mode;
-	struct nm_desc_t *nm_desc;
-	uint32_t begin;
-	uint32_t end;
-	struct netmap_ring *rxring;
-	struct netmap_ring *txring;
-	odp_queue_t tx_access; /* Used for exclusive access to send packets */
-	uint32_t if_flags;
-	char ifname[32];
-} pkt_netmap_t;
-
-/**
- * Configure an interface to work in netmap mode
- */
-int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev,
-		     odp_buffer_pool_t pool, netmap_params_t *nm_params);
-
-/**
- * Switch interface from netmap mode to normal mode
- */
-int close_pkt_netmap(pkt_netmap_t * const pkt_nm);
-
-/**
- * Receive packets using netmap
- */
-int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
-		    unsigned len);
-
-/**
- * Send packets using netmap
- */
-int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[],
-		    unsigned len);
-#endif