From cf9f2c56cb00f0e879eed9c95bff824ba1499656 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 24 Nov 2019 10:11:19 -0600 Subject: [PATCH] et/devif/devif_callback.c: devif_event_trigger shouldn't return true if triggers & DEVPOLL_MASK equal zero() --- include/nuttx/net/netconfig.h | 6 ++++-- net/devif/devif_callback.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/nuttx/net/netconfig.h b/include/nuttx/net/netconfig.h index be43760a9a..69c713cba9 100644 --- a/include/nuttx/net/netconfig.h +++ b/include/nuttx/net/netconfig.h @@ -533,7 +533,8 @@ # define MIN_TCP_MSS __MIN_TCP_MSS(__IPv6_HDRLEN) #endif -/* How long a connection should stay in the TIME_WAIT state. +/* How long a connection should stay in the TIME_WAIT state (in units of + * seconds). * * TIME_WAIT is often also known as the 2MSL wait state. This is because * the socket that transitions to TIME_WAIT stays there for a period that @@ -542,7 +543,8 @@ * being discarded. This time limit is ultimately bounded by the TTL field * in the IP datagram that is used to transmit the TCP segment. RFC 793 * specifies MSL as 2 minutes but most systems permit this value to be tuned. - * Here a default of 2 minutes is used, half the value specified by RFC 793. + * Here a default TIME_WAIT (2MSL) 2 minutes is used, half the value + * specified by RFC 793. */ #ifdef CONFIG_NET_TCP_WAIT_TIMEOUT diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index 5d4a57d627..ee85bafee0 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -194,7 +194,7 @@ static bool devif_event_trigger(uint16_t events, uint16_t triggers) if ((events & DEVPOLL_MASK) == (triggers & DEVPOLL_MASK)) { - return true; + return (triggers & DEVPOLL_MASK) != 0; } /* No.. this event set will not generate the callback */