From d88dc9b2e5dcf450249c25561ba6b94c09fb307b Mon Sep 17 00:00:00 2001 From: Simon Piriou Date: Sat, 22 Jul 2017 09:00:36 -0600 Subject: [PATCH] net_pkt: fix typo and symbol collision --- net/local/local_sockif.c | 2 +- net/pkt/pkt_sockif.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/local/local_sockif.c b/net/local/local_sockif.c index 3bb225de70..bb8df5adf3 100644 --- a/net/local/local_sockif.c +++ b/net/local/local_sockif.c @@ -614,7 +614,7 @@ static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds, { /* Perform the TCP/IP poll() teardown */ - return loal_pollteardown(psock, fds); + return local_pollteardown(psock, fds); } #endif /* HAVE_LOCAL_POLL */ } diff --git a/net/pkt/pkt_sockif.c b/net/pkt/pkt_sockif.c index c1af74ba93..076149ba79 100644 --- a/net/pkt/pkt_sockif.c +++ b/net/pkt/pkt_sockif.c @@ -72,7 +72,7 @@ static int pkt_connect(FAR struct socket *psock, static int pkt_accept(FAR struct socket *psock, FAR struct sockaddr *addr, FAR socklen_t *addrlen, FAR struct socket *newsock); #ifndef CONFIG_DISABLE_POLL -static int pkt_poll(FAR struct socket *psock, +static int pkt_poll_local(FAR struct socket *psock, FAR struct pollfd *fds, bool setup); #endif static ssize_t pkt_send(FAR struct socket *psock, FAR const void *buf, @@ -97,7 +97,7 @@ const struct sock_intf_s g_pkt_sockif = pkt_connect, /* si_connect */ pkt_accept, /* si_accept */ #ifndef CONFIG_DISABLE_POLL - pkt_poll, /* si_poll */ + pkt_poll_local, /* si_poll */ #endif pkt_send, /* si_send */ pkt_sendto, /* si_sendto */ @@ -475,8 +475,8 @@ int pkt_listen(FAR struct socket *psock, int backlog) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -static int pkt_poll(FAR struct socket *psock, FAR struct pollfd *fds, - bool setup) +static int pkt_poll_local(FAR struct socket *psock, FAR struct pollfd *fds, + bool setup) { return -ENOSYS; }