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

Resove merge conflicts

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-15 10:04:33 -06:00
parent 2b758537ea
commit ebb6fd1e9c
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netdev/netdev_register.c
+1 -4
View File
@@ -121,6 +121,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
#ifdef CONFIG_NET_MULTILINK
/* We are supporting multiple network devices and using different link
* level protocols. Set the protocol usd by the device and the size
* level protocols. Set the protocol used by the device and the size
* of the link header used by this protocol.
*/
@@ -128,17 +129,13 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
{
#ifdef CONFIG_NET_ETHERNET
case NET_LL_ETHERNET: /* Ethernet */
#if 0 /* REVISIT: Not yet supported */
dev->d_llhdrlen = ETH_HDRLEN;
#endif
break;
#endif
#ifdef CONFIG_NET_SLIP
case NET_LL_SLIP: /* Serial Line Internet Protocol (SLIP) */
#if 0 /* REVISIT: Not yet supported */
dev->d_llhdrlen = 0;
#endif
break;
#endif