You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/05/26 08:15:47 UTC
[GitHub] [incubator-nuttx] pkarashchenko commented on a diff in pull request #6330: tcp: move wd_timer from wifi driver to tcp stack
pkarashchenko commented on code in PR #6330:
URL: https://github.com/apache/incubator-nuttx/pull/6330#discussion_r882428696
##########
net/tcp/tcp_input.c:
##########
@@ -1288,7 +1290,8 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
if ((flags & TCP_ACKDATA) != 0)
{
conn->tcpstateflags = TCP_TIME_WAIT;
- conn->timer = TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC;
+ tcp_update_retrantimer(conn,
+ TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
Review Comment:
```suggestion
tcp_update_retrantimer(conn,
TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
```
##########
net/tcp/tcp_input.c:
##########
@@ -1225,7 +1225,8 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
if ((flags & TCP_ACKDATA) != 0 && conn->tx_unacked == 0)
{
conn->tcpstateflags = TCP_TIME_WAIT;
- conn->timer = TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC;
+ tcp_update_retrantimer(conn,
+ TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
Review Comment:
```suggestion
tcp_update_retrantimer(conn,
TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
```
##########
net/devif/devif_poll.c:
##########
@@ -849,29 +798,7 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
int devif_timer(FAR struct net_driver_s *dev, int delay,
devif_poll_callback_t callback)
{
-#if defined(NET_TCP_HAVE_STACK)
- int hsec = TICK2HSEC(delay);
-#endif
- int bstop = false;
-
-#ifdef NET_TCP_HAVE_STACK
- /* Traverse all of the active TCP connections and perform the
- * timer action.
- */
-
- bstop = devif_poll_tcp_timer(dev, callback, hsec);
-#endif
-
- /* If possible, continue with a normal poll checking for pending
- * network driver actions.
- */
-
- if (!bstop)
- {
- bstop = devif_poll(dev, callback);
- }
-
- return bstop;
+ return devif_poll(dev, callback);
Review Comment:
so `delay` parameter now is ignored?
##########
net/tcp/tcp_input.c:
##########
@@ -1263,7 +1264,8 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
if ((tcp->flags & TCP_FIN) != 0)
{
conn->tcpstateflags = TCP_TIME_WAIT;
- conn->timer = TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC;
+ tcp_update_retrantimer(conn,
+ TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
Review Comment:
```suggestion
tcp_update_retrantimer(conn,
TCP_TIME_WAIT_TIMEOUT * HSEC_PER_SEC);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org