From 569ff602ea9e4228572d1fcc715d8b4fc7ff1f8a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 24 Aug 2015 08:29:07 -0600 Subject: [PATCH] Networking: Remove bogus references to PPP as a link layer protocol --- ChangeLog | 3 +++ include/nuttx/net/net.h | 3 +-- net/netdev/netdev_register.c | 13 +------------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61f179f3261..d6a532f42c3 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10871,3 +10871,6 @@ * libc/libc.csv and syscalls/syscalls.csv: Define some symbol export conditions, correct errno and add sleep and usleep. From Pavel Pisa (2015-08-23). + * net/ ande include/nuttx/net: Remove references to PPP as a + link layer protocol (2015-08-24). + diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h index 77c7fd807ab..9519407c8f1 100644 --- a/include/nuttx/net/net.h +++ b/include/nuttx/net/net.h @@ -77,7 +77,6 @@ enum net_lltype_e { NET_LL_ETHERNET = 0, /* Ethernet */ NET_LL_SLIP, /* Serial Line Internet Protocol (SLIP) */ - NET_LL_PPP, /* Point-to-Point Protocol (PPP) */ NET_LL_TUN, /* TUN Virtual Network Device */ }; @@ -1078,7 +1077,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 diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c index 524f6cb2d4b..38f77d516dd 100644 --- a/net/netdev/netdev_register.c +++ b/net/netdev/netdev_register.c @@ -159,7 +159,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: @@ -223,17 +223,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;