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

netdev_register: If there is only one ieee80211 and both CONFIG_ETHERNET and CONFIG_DRIVERS_IEEE8011, then use the wlan0 naming, not the eth0 naming.

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-25 15:51:30 -06:00
parent ace460ad0e
commit 1c97025484
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netdev/netdev_register.c
View File

@ -70,10 +70,10 @@
#if defined(CONFIG_NET_SLIP) #if defined(CONFIG_NET_SLIP)
# define NETDEV_DEFAULT_FORMAT NETDEV_SLIP_FORMAT # define NETDEV_DEFAULT_FORMAT NETDEV_SLIP_FORMAT
#elif defined(CONFIG_DRIVERS_IEEE80211) /* Usually also has CONFIG_NET_ETHERNET */
# define NETDEV_DEFAULT_FORMAT NETDEV_WLAN_FORMAT
#elif defined(CONFIG_NET_ETHERNET) #elif defined(CONFIG_NET_ETHERNET)
# define NETDEV_DEFAULT_FORMAT NETDEV_ETH_FORMAT # define NETDEV_DEFAULT_FORMAT NETDEV_ETH_FORMAT
#elif defined(CONFIG_DRIVERS_IEEE80211)
# define NETDEV_DEFAULT_FORMAT NETDEV_WLAN_FORMAT
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(CONFIG_NET_6LOWPAN)
# define NETDEV_DEFAULT_FORMAT NETDEV_WPAN_FORMAT # define NETDEV_DEFAULT_FORMAT NETDEV_WPAN_FORMAT
#else /* if defined(CONFIG_NET_LOOPBACK) */ #else /* if defined(CONFIG_NET_LOOPBACK) */
@ -332,7 +332,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
#endif #endif
net_unlock(); net_unlock();
#ifdef CONFIG_NET_ETHERNET #if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_DRIVERS_IEEE80211)
ninfo("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", ninfo("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
dev->d_mac.ether.ether_addr_octet[0], dev->d_mac.ether.ether_addr_octet[1], dev->d_mac.ether.ether_addr_octet[0], dev->d_mac.ether.ether_addr_octet[1],
dev->d_mac.ether.ether_addr_octet[2], dev->d_mac.ether.ether_addr_octet[3], dev->d_mac.ether.ether_addr_octet[2], dev->d_mac.ether.ether_addr_octet[3],