diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-08 09:24:37 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-08 09:24:37 -0600 |
| commit | 932c6d29df0833e8ce8f5941ecf4e4d8af56409f (patch) | |
| tree | fedff411027c6fe8c8bf6dc77a74b9ebdee34018 | |
| parent | c71a550465ad52eff3c7aa6d6fe766a133b32df4 (diff) | |
| download | nuttx-932c6d29df0833e8ce8f5941ecf4e4d8af56409f.tar.gz nuttx-932c6d29df0833e8ce8f5941ecf4e4d8af56409f.tar.bz2 nuttx-932c6d29df0833e8ce8f5941ecf4e4d8af56409f.zip | |
uip_tcpcallback: Simplify handling of callback return flags
| -rw-r--r-- | nuttx/net/uip/uip_tcpcallback.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nuttx/net/uip/uip_tcpcallback.c b/nuttx/net/uip/uip_tcpcallback.c index 671f9d53e..a5ac5153f 100644 --- a/nuttx/net/uip/uip_tcpcallback.c +++ b/nuttx/net/uip/uip_tcpcallback.c @@ -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; } /**************************************************************************** |