sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uip_tcpcallback: Simplify handling of callback return flags

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-08 09:24:37 -06:00
parent d5ec15fc78
commit 50441eb9ee
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/uip/uip_tcpcallback.c
View File

@ -199,8 +199,6 @@ uint16_t uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn,
* explicitly set in the callback.
*/
uint16_t ret = flags;
nllvdbg("flags: %04x\n", flags);
/* Perform the data callback. When a data callback is executed from 'list',
@ -222,7 +220,7 @@ uint16_t uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn,
* dev->d_len should also be cleared).
*/
ret = uip_callbackexecute(dev, conn, flags, conn->list);
flags = uip_callbackexecute(dev, conn, flags, conn->list);
/* There may be no new data handler in place at them moment that the new
* incoming data is received. If the new incoming data was not handled, then
@ -231,25 +229,25 @@ uint16_t uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn,
* be re-transmitted at a better time.
*/
if ((ret & UIP_NEWDATA) != 0)
if ((flags & UIP_NEWDATA) != 0)
{
/* Data was not handled.. dispose of it appropriately */
ret = uip_dataevent(dev, conn, ret);
flags = uip_dataevent(dev, conn, ret);
}
/* Check if there is a connection-related event and a connection
* callback.
*/
if (ret != 0 && ((flags & UIP_CONN_EVENTS) != 0) && conn->connection_event)
if (((flags & UIP_CONN_EVENTS) != 0) && conn->connection_event)
{
/* Perform the callback */
conn->connection_event(conn, flags);
}
return ret;
return flags;
}
/****************************************************************************