From 9f7d3320287c4c66dcd93d362ae57e19b74ee70a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 18 Jan 2017 07:32:27 -0600 Subject: [PATCH] Minor changes from the review of the last PR --- net/devif/ipv6_input.c | 2 +- net/tcp/tcp_devpoll.c | 13 +++++++++---- net/tcp/tcp_send_buffered.c | 2 +- net/tcp/tcp_send_unbuffered.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c index bb6c210bd15..3a2a665903b 100644 --- a/net/devif/ipv6_input.c +++ b/net/devif/ipv6_input.c @@ -2,7 +2,7 @@ * net/devif/ipv6_input.c * Device driver IPv6 packet receipt interface * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Adapted for NuttX from logic in uIP which also has a BSD-like license: diff --git a/net/tcp/tcp_devpoll.c b/net/tcp/tcp_devpoll.c index 2a3fdcbdf3a..6a7f16c513b 100644 --- a/net/tcp/tcp_devpoll.c +++ b/net/tcp/tcp_devpoll.c @@ -2,7 +2,7 @@ * net/tcp/tcp_devpoll.c * Driver poll for the availability of TCP TX data * - * Copyright (C) 2007-2009, 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Adapted for NuttX from logic in uIP which also has a BSD-like license: @@ -106,13 +106,18 @@ void tcp_poll(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn) */ #if defined(CONFIG_NET_IPv6) && defined(CONFIG_NET_IPv4) - if(conn->domain == PF_INET) { + if (conn->domain == PF_INET) + { tcp_ipv4_select(dev); - } else { + } + else + { tcp_ipv6_select(dev); - } + } + #elif defined(CONFIG_NET_IPv4) tcp_ipv4_select(dev); + #else /* if defined(CONFIG_NET_IPv6) */ tcp_ipv6_select(dev); #endif diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 160be02213d..e3c12aed7e6 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/tcp/tcp_send_buffered.c * - * Copyright (C) 2007-2014, 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2014, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Jason Jiang * diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 114fd80355f..d6422437c8c 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/tcp/tcp_send_unbuffered.c * - * Copyright (C) 2007-2014, 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2014, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without