Replace confusing references to uIP with just 'the network'

This commit is contained in:
Gregory Nutt
2016-05-30 09:31:44 -06:00
parent f65616f872
commit 4f208600aa
17 changed files with 32 additions and 32 deletions
+7 -7
View File
@@ -136,10 +136,10 @@ static inline int close_timeout(FAR struct tcp_close_s *pstate)
* Function: netclose_interrupt
*
* Description:
* Handle uIP callback events.
* Handle network callback events.
*
* Parameters:
* conn - uIP TCP connection structure
* conn - TCP connection structure
*
* Returned Value:
* None
@@ -320,7 +320,7 @@ static inline void netclose_txnotify(FAR struct socket *psock,
* Break any current TCP connection
*
* Parameters:
* conn - uIP TCP connection structure
* conn - TCP connection structure
*
* Returned Value:
* None
@@ -428,7 +428,7 @@ static inline int netclose_disconnect(FAR struct socket *psock)
/* Free the connection */
conn->crefs = 0; /* No more references on the connection */
tcp_free(conn); /* Free uIP resources */
tcp_free(conn); /* Free network resources */
/* Get the result of the close */
@@ -517,7 +517,7 @@ int psock_close(FAR struct socket *psock)
goto errout;
}
/* We perform the uIP close operation only if this is the last count on
/* We perform the close operation only if this is the last count on
* the socket. (actually, I think the socket crefs only takes the values
* 0 and 1 right now).
*
@@ -527,7 +527,7 @@ int psock_close(FAR struct socket *psock)
if (psock->s_crefs <= 1 && psock->s_conn != NULL)
{
/* Perform uIP side of the close depending on the protocol type */
/* Perform local side of the close depending on the protocol type */
switch (psock->s_type)
{
@@ -649,7 +649,7 @@ int psock_close(FAR struct socket *psock)
/* Yes... free the connection structure */
conn->crefs = 0; /* No more references on the connection */
pkt_free(psock->s_conn); /* Free uIP resources */
pkt_free(psock->s_conn); /* Free network resources */
}
else
{
+1 -1
View File
@@ -402,7 +402,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
dev->d_sndlen = sndlen;
/* Set the sequence number for this packet. NOTE: uIP updates
/* Set the sequence number for this packet. NOTE: The network updates
* sndseq on recept of ACK *before* this function is called. In that
* case sndseq will point to the next unacknowledge byte (which might
* have already been sent). We will overwrite the value of sndseq
+2 -2
View File
@@ -1692,8 +1692,8 @@ static ssize_t tcp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
}
}
/* In general, this uIP-based implementation will not support non-blocking
* socket operations... except in a few cases: Here for TCP receive with read-ahead
/* In general, this implementation will not support non-blocking socket
* operations... except in a few cases: Here for TCP receive with read-ahead
* enabled. If this socket is configured as non-blocking then return EAGAIN
* if no data was obtained from the read-ahead buffers.
*/