Re: [lng-odp] [PATCH 1/2] linux-generic: pktio: rename loop and sock _init functions to _open

[Maxim Uvarov]

That patch 1/1 is merged.

Maxim.

On 07/17/15 12:14, Nicolas Morey-Chaisemartin wrote:

Function names are now coherent with pktio_if_opts names

Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
---
  platform/linux-generic/pktio/loop.c   | 4 ++--
  platform/linux-generic/pktio/socket.c | 8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/linux-generic/pktio/loop.c 
b/platform/linux-generic/pktio/loop.c
index 86201ee..073116a 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -24,7 +24,7 @@
  /* MAC address for the "loop" interface */
  static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01};

-static int loopback_init(odp_pktio_t id, pktio_entry_t *pktio_entry,

+static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry,
                         const char *devname, odp_pool_t pool ODP_UNUSED)
  {
        if (strcmp(devname, "loop"))
@@ -105,7 +105,7 @@ static int loopback_promisc_mode_get(pktio_entry_t 
*pktio_entry)
  }

const pktio_if_ops_t loopback_pktio_ops = {

-       .open = loopback_init,
+       .open = loopback_open,
        .close = loopback_close,
        .recv = loopback_recv_pkt,
        .send = loopback_send_pkt,
diff --git a/platform/linux-generic/pktio/socket.c 
b/platform/linux-generic/pktio/socket.c
index 9bd4e8f..f3bb12e 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -256,7 +256,7 @@ error:
  /*
   * ODP_PACKET_SOCKET_BASIC:
   */
-static int sock_basic_init(odp_pktio_t id ODP_UNUSED,
+static int sock_basic_open(odp_pktio_t id ODP_UNUSED,
                           pktio_entry_t *pktio_entry,
                           const char *devname, odp_pool_t pool)
  {
@@ -268,7 +268,7 @@ static int sock_basic_init(odp_pktio_t id ODP_UNUSED,
  /*
   * ODP_PACKET_SOCKET_MMSG:
   */
-static int sock_mmsg_init(odp_pktio_t id ODP_UNUSED,
+static int sock_mmsg_open(odp_pktio_t id ODP_UNUSED,
                          pktio_entry_t *pktio_entry,
                          const char *devname, odp_pool_t pool)
  {
@@ -532,7 +532,7 @@ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry)
  }

const pktio_if_ops_t sock_basic_pktio_ops = {

-       .open = sock_basic_init,
+       .open = sock_basic_open,
        .close = sock_close_pkt,
        .recv = sock_basic_recv_pkt,
        .send = sock_basic_send_pkt,
@@ -543,7 +543,7 @@ const pktio_if_ops_t sock_basic_pktio_ops = {
  };

const pktio_if_ops_t sock_mmsg_pktio_ops = {

-       .open = sock_mmsg_init,
+       .open = sock_mmsg_open,
        .close = sock_close_pkt,
        .recv = sock_mmsg_recv_pkt,
        .send = sock_mmsg_send_pkt,

_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp