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

This commit is contained in:
Gregory Nutt
2015-08-24 08:29:36 -06:00
4 changed files with 26 additions and 14 deletions
+1 -12
View File
@@ -160,7 +160,7 @@ static int find_devnum(FAR const char *devfmt)
*
* 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:
@@ -235,17 +235,6 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
break;
#endif
#if 0 /* REVISIT: Not yet supported */
case NET_LL_PPP: /* Point-to-Point Protocol (PPP) */
dev->d_llhdrlen = 0;
dev->d_mtu = CONFIG_NET_PPP_MTU;
#ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_PPP_TCP_RECVWNDO;
#endif
devfmt = NETDEV_PPP_FORMAT;
break;
#endif
default:
nlldbg("ERROR: Unrecognized link type: %d\n", lltype);
return -EINVAL;