diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 10:34:52 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 10:34:52 -0600 |
commit | 86a37059e98e46294dff804ed9265bfc112d675b (patch) | |
tree | 629492c7c7af23a999bda24e9fdcde75e04ea4cb /nuttx/net/pkt/pkt_input.c | |
parent | f1994c5a179ba323f3dc29de7bc4cbaadeb4a831 (diff) | |
download | nuttx-86a37059e98e46294dff804ed9265bfc112d675b.tar.gz nuttx-86a37059e98e46294dff804ed9265bfc112d675b.tar.bz2 nuttx-86a37059e98e46294dff804ed9265bfc112d675b.zip |
Clean-up packet socket naming
Diffstat (limited to 'nuttx/net/pkt/pkt_input.c')
-rw-r--r-- | nuttx/net/pkt/pkt_input.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nuttx/net/pkt/pkt_input.c b/nuttx/net/pkt/pkt_input.c index 6b803cb20..dd9bc07fa 100644 --- a/nuttx/net/pkt/pkt_input.c +++ b/nuttx/net/pkt/pkt_input.c @@ -53,6 +53,7 @@ #include <nuttx/net/arp.h> #include "uip/uip.h" +#include "pkt/pkt.h" /**************************************************************************** * Pre-processor Definitions @@ -77,7 +78,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: uip_pktinput + * Name: pkt_input * * Description: * Handle incoming packet input @@ -95,13 +96,13 @@ * ****************************************************************************/ -int uip_pktinput(struct uip_driver_s *dev) +int pkt_input(struct uip_driver_s *dev) { - struct uip_pkt_conn *conn; - struct eth_hdr_s *pbuf = (struct eth_hdr_s *)dev->d_buf; + FAR struct pkt_conn_s *conn; + FAR struct eth_hdr_s *pbuf = (struct eth_hdr_s *)dev->d_buf; int ret = OK; - conn = uip_pktactive(pbuf); + conn = pkt_active(pbuf); if (conn) { uint16_t flags; @@ -114,7 +115,7 @@ int uip_pktinput(struct uip_driver_s *dev) /* Perform the application callback */ - flags = uip_pktcallback(dev, conn, UIP_NEWDATA); + flags = pkt_callback(dev, conn, UIP_NEWDATA); /* If the operation was successful, the UIP_NEWDATA flag is removed * and thus the packet can be deleted (OK will be returned). |