summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-06-30 19:09:23 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-06-30 19:09:23 -0600
commit00d337bc4d48fde61f37ad21e6b07bee3105b7d3 (patch)
treedf6d409b56236989e65a24d030e02ff30dbe236e /nuttx
parent3e9da6c0f0ca85e1d4db88f3b592da1f75a0cbab (diff)
downloadpx4-nuttx-00d337bc4d48fde61f37ad21e6b07bee3105b7d3.tar.gz
px4-nuttx-00d337bc4d48fde61f37ad21e6b07bee3105b7d3.tar.bz2
px4-nuttx-00d337bc4d48fde61f37ad21e6b07bee3105b7d3.zip
NET: Rename uip_mss to tcp_mss
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/drivers/net/slip.c2
-rw-r--r--nuttx/include/nuttx/net/tcp.h4
-rw-r--r--nuttx/net/devif/devif.h2
-rw-r--r--nuttx/net/socket/net_sendfile.c4
-rw-r--r--nuttx/net/tcp/tcp_send_buffered.c4
-rw-r--r--nuttx/net/tcp/tcp_send_unbuffered.c12
6 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index 7746c4e20..a13233185 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -102,7 +102,7 @@
* a MTU of 296 and window of 256, but actually only sends 168 bytes of data:
* 40 + 128. I believe that is to allow for the 2x worst cast packet
* expansion. Ideally we would like to advertise the 256 MSS, but restrict
- * uIP to 128 bytes (possibly by modifying the uip_mss() macro).
+ * uIP to 128 bytes (possibly by modifying the tcp_mss() macro).
*/
#if CONFIG_NET_BUFSIZE < 296
diff --git a/nuttx/include/nuttx/net/tcp.h b/nuttx/include/nuttx/net/tcp.h
index 3755ba703..5b25e7a3b 100644
--- a/nuttx/include/nuttx/net/tcp.h
+++ b/nuttx/include/nuttx/net/tcp.h
@@ -486,10 +486,10 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
} while (0)
/* Get the current maximum segment size that can be sent on the current
- * connection.
+ * TCP connection.
*/
-#define uip_mss(conn) ((conn)->mss)
+#define tcp_mss(conn) ((conn)->mss)
#endif /* CONFIG_NET_TCP */
#endif /* __INCLUDE_NUTTX_NET_TCP_H */
diff --git a/nuttx/net/devif/devif.h b/nuttx/net/devif/devif.h
index 32d603b5f..1c47b43c3 100644
--- a/nuttx/net/devif/devif.h
+++ b/nuttx/net/devif/devif.h
@@ -185,7 +185,7 @@ uint16_t devif_callback_execute(FAR struct net_driver_s *dev, FAR void *pvconn,
* The amount of data that actually is sent out after a call to this
* function is determined by the maximum amount of data TCP allows. uIP
* will automatically crop the data so that only the appropriate
- * amount of data is sent. The function uip_mss() can be used to query
+ * amount of data is sent. The function tcp_mss() can be used to query
* uIP for the amount of data that actually will be sent.
*
* Note: This function does not guarantee that the sent data will
diff --git a/nuttx/net/socket/net_sendfile.c b/nuttx/net/socket/net_sendfile.c
index 41631c559..e70af9eef 100644
--- a/nuttx/net/socket/net_sendfile.c
+++ b/nuttx/net/socket/net_sendfile.c
@@ -262,9 +262,9 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
uint32_t sndlen = pstate->snd_flen - pstate->snd_sent;
- if (sndlen > uip_mss(conn))
+ if (sndlen > tcp_mss(conn))
{
- sndlen = uip_mss(conn);
+ sndlen = tcp_mss(conn);
}
/* Check if we have "space" in the window */
diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c
index e8a7dab27..dda1233d0 100644
--- a/nuttx/net/tcp/tcp_send_buffered.c
+++ b/nuttx/net/tcp/tcp_send_buffered.c
@@ -563,9 +563,9 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
*/
sndlen = WRB_PKTLEN(wrb) - WRB_SENT(wrb);
- if (sndlen > uip_mss(conn))
+ if (sndlen > tcp_mss(conn))
{
- sndlen = uip_mss(conn);
+ sndlen = tcp_mss(conn);
}
if (sndlen > conn->winsize)
diff --git a/nuttx/net/tcp/tcp_send_unbuffered.c b/nuttx/net/tcp/tcp_send_unbuffered.c
index 2b2a6e16f..193db3f34 100644
--- a/nuttx/net/tcp/tcp_send_unbuffered.c
+++ b/nuttx/net/tcp/tcp_send_unbuffered.c
@@ -297,12 +297,12 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
if (sndlen >= CONFIG_NET_TCP_SPLIT_SIZE)
{
/* sndlen is the number of bytes remaining to be sent.
- * uip_mss(conn) will return the number of bytes that can sent
+ * tcp_mss(conn) will return the number of bytes that can sent
* in one packet. The difference, then, is the number of bytes
* that would be sent in the next packet after this one.
*/
- int32_t next_sndlen = sndlen - uip_mss(conn);
+ int32_t next_sndlen = sndlen - tcp_mss(conn);
/* Is this the even packet in the packet pair transaction? */
@@ -329,13 +329,13 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
{
/* Will there be another (even) packet afer this one?
* (next_sndlen > 0) Will the split condition occur on that
- * next, even packet? ((next_sndlen - uip_mss(conn)) < 0) If
+ * next, even packet? ((next_sndlen - tcp_mss(conn)) < 0) If
* so, then perform the split now to avoid the case where the
* byte count is less than CONFIG_NET_TCP_SPLIT_SIZE on the
* next pair.
*/
- if (next_sndlen > 0 && (next_sndlen - uip_mss(conn)) < 0)
+ if (next_sndlen > 0 && (next_sndlen - tcp_mss(conn)) < 0)
{
/* Here, we know that sndlen must be MSS < sndlen <= 2*MSS
* and so (sndlen / 2) is <= MSS.
@@ -352,9 +352,9 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
#endif /* CONFIG_NET_TCP_SPLIT */
- if (sndlen > uip_mss(conn))
+ if (sndlen > tcp_mss(conn))
{
- sndlen = uip_mss(conn);
+ sndlen = tcp_mss(conn);
}
/* Check if we have "space" in the window */