Networking: Cosmetic change

This commit is contained in:
Gregory Nutt
2016-02-24 19:02:51 -06:00
parent d19e9cc448
commit bcbd8ee964
7 changed files with 17 additions and 15 deletions
+1 -1
Submodule arch updated: 733010246b...e42c14f776
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/local/local_connnect.c * net/local/local_connnect.c
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -97,7 +97,7 @@ static inline void _local_semtake(sem_t *sem)
* the wait was awakened by a signal. * the wait was awakened by a signal.
*/ */
ASSERT(*get_errno_ptr() == EINTR); DEBUGASSERT(get_errno() == EINTR);
} }
} }
+6 -4
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/netdev/netdev_ioctl.c * net/netdev/netdev_ioctl.c
* *
* Copyright (C) 2007-2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2012, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -1083,26 +1083,28 @@ int netdev_ioctl(int sockfd, int cmd, unsigned long arg)
/* Execute the command */ /* Execute the command */
ret = netdev_ifrioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg)); ret = netdev_ifrioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg));
#ifdef CONFIG_NET_IGMP #ifdef CONFIG_NET_IGMP
/* Check for address filtering commands */
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_imsfioctl(psock, cmd, (FAR struct ip_msfilter *)((uintptr_t)arg)); ret = netdev_imsfioctl(psock, cmd, (FAR struct ip_msfilter *)((uintptr_t)arg));
} }
#endif #endif
#ifdef CONFIG_NET_ARP
/* Check for ARP table IOCTL commands */ /* Check for ARP table IOCTL commands */
#ifdef CONFIG_NET_ARP
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_arpioctl(psock, cmd, (FAR struct arpreq *)((uintptr_t)arg)); ret = netdev_arpioctl(psock, cmd, (FAR struct arpreq *)((uintptr_t)arg));
} }
#endif #endif
#ifdef CONFIG_NET_ROUTE
/* Check for Routing table IOCTL commands */ /* Check for Routing table IOCTL commands */
#ifdef CONFIG_NET_ROUTE
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_rtioctl(psock, cmd, (FAR struct rtentry *)((uintptr_t)arg)); ret = netdev_rtioctl(psock, cmd, (FAR struct rtentry *)((uintptr_t)arg));
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/pkt/pkt_conn.c * net/pkt/pkt_conn.c
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Large parts of this file were leveraged from uIP logic: * Large parts of this file were leveraged from uIP logic:
@@ -97,7 +97,7 @@ static inline void _pkt_semtake(sem_t *sem)
* the wait was awakened by a signal. * the wait was awakened by a signal.
*/ */
ASSERT(*get_errno_ptr() == EINTR); DEBUGASSERT(get_errno() == EINTR);
} }
} }
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/socket/bind.c * net/socket/bind.c
* *
* Copyright (C) 2007-2009, 2012, 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2012, 2014-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -316,7 +316,7 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
return OK; return OK;
errout: errout:
*get_errno_ptr() = err; set_errno(err);
return ERROR; return ERROR;
} }
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/socket/net_sockets.c * net/socket/net_sockets.c
* *
* Copyright (C) 2007-2009, 2011-2014 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011-2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ static void _net_semtake(FAR struct socketlist *list)
* the wait was awakened by a signal. * the wait was awakened by a signal.
*/ */
ASSERT(*get_errno_ptr() == EINTR); DEBUGASSERT(get_errno() == EINTR);
} }
} }
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* net/udp/udp_conn.c * net/udp/udp_conn.c
* *
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Large parts of this file were leveraged from uIP logic: * Large parts of this file were leveraged from uIP logic:
@@ -115,7 +115,7 @@ static inline void _udp_semtake(FAR sem_t *sem)
* the wait was awakened by a signal. * the wait was awakened by a signal.
*/ */
ASSERT(*get_errno_ptr() == EINTR); ASSERT(get_errno() == EINTR);
} }
} }