sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into beacon802154

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-14 16:22:31 -06:00
commit 0508c8f793
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netutils/netlib/netlib_getifstatus.c
View File

@ -64,6 +64,12 @@
# define PF_INETX PF_INET
#elif defined(CONFIG_NET_IPv6)
# define PF_INETX PF_INET6
#elif defined(CONFIG_NET_LOCAL)
# define PF_INETX PF_LOCAL
#elif defined(CONFIG_NET_PKT)
# define PF_INETX PF_PACKET
#elif defined(CONFIG_NET_USRSOCK)
# define PF_INETX PF_INET
#endif
/****************************************************************************

6
netutils/netlib/netlib_getmacaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/netlib/netlib_getmacaddr.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -63,6 +63,10 @@
# define PF_INETX PF_INET
#elif defined(CONFIG_NET_IPv6)
# define PF_INETX PF_INET6
#elif defined(CONFIG_NET_PKT)
# define PF_INETX PF_PACKET
#elif defined(CONFIG_NET_USRSOCK)
# define PF_INETX PF_INET
#endif
/****************************************************************************

6
netutils/netlib/netlib_setifstatus.c
View File

@ -63,6 +63,12 @@
# define PF_INETX PF_INET
#elif defined(CONFIG_NET_IPv6)
# define PF_INETX PF_INET6
#elif defined(CONFIG_NET_LOCAL)
# define PF_INETX PF_LOCAL
#elif defined(CONFIG_NET_PKT)
# define PF_INETX PF_PACKET
#elif defined(CONFIG_NET_USRSOCK)
# define PF_INETX PF_INET
#endif
/****************************************************************************

8
netutils/netlib/netlib_setmacaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/netlib/netlib_setmacaddr.c
*
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011-2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -66,6 +66,12 @@
#elif defined(CONFIG_NET_IPv6)
# define PF_INETX PF_INET6
# define AF_INETX AF_INET6
#elif defined(CONFIG_NET_PKT)
# define PF_INETX PF_PACKET
# define AF_INETX AF_PACKET
#elif defined(CONFIG_NET_USRSOCK)
# define PF_INETX PF_INET
# define AF_INETX AF_INET
#endif
/****************************************************************************

7
nshlib/nsh_netcmds.c
View File

@ -1096,6 +1096,13 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
}
#endif
#if !defined(CONFIG_NET_IPv4) && !defined(CONFIG_NET_IPv6)
UNUSED(hostip);
UNUSED(mask);
UNUSED(gwip);
UNUSED(gip);
#endif
return OK;
}
#endif