Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt
2015-08-24 08:29:36 -06:00
parent ea2fafb024 569ff602ea
commit e21501c699
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/net/net.h
+1 -2
View File
@@ -78,7 +78,6 @@ enum net_lltype_e
NET_LL_ETHERNET = 0, /* Ethernet */
NET_LL_LOOPBACK, /* Local loopback */
NET_LL_SLIP, /* Serial Line Internet Protocol (SLIP) */
NET_LL_PPP, /* Point-to-Point Protocol (PPP) */
NET_LL_TUN, /* TUN Virtual Network Device */
};
@@ -1079,7 +1078,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap);
*
* Parameters:
* dev - The device driver structure to be registered.
* lltype - Link level protocol used by the driver (Ethernet, SLIP, PPP, ...
* lltype - Link level protocol used by the driver (Ethernet, SLIP, TUN, ...
*
* Returned Value:
* 0:Success; negated errno on failure