Merge branch 'ieee802154'

This commit is contained in:
Gregory Nutt 2017-06-18 15:24:18 -06:00
commit d383418a5b
2 changed files with 4 additions and 2 deletions

View File

@ -90,6 +90,8 @@
/* Pick one and at most one supported link layer so that all decisions are /* Pick one and at most one supported link layer so that all decisions are
* made consistently. * made consistently.
*
* NOTE: Ethernet should always be selected with IEEE 802.11
*/ */
#if defined(CONFIG_NET_ETHERNET) #if defined(CONFIG_NET_ETHERNET)

View File

@ -444,7 +444,7 @@ static void i8sak_switch_instance(FAR char *devname)
i8sak = (FAR struct i8sak_s *)sq_remfirst(&g_i8sak_free); i8sak = (FAR struct i8sak_s *)sq_remfirst(&g_i8sak_free);
if (i8sak == NULL) if (i8sak == NULL)
{ {
fprintf(stderr, "failed to allocate i8sak instance\n"); fprintf(stderr, "ERROR: Failed to allocate i8sak instance\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -488,7 +488,7 @@ static int i8sak_setup(FAR struct i8sak_s *i8sak, FAR const char *devname)
if (strlen(devname) > I8SAK_MAX_DEVNAME) if (strlen(devname) > I8SAK_MAX_DEVNAME)
{ {
fprintf(stderr, "i8sak: too long of devname"); fprintf(stderr, "ERROR: devname too long\n");
return ERROR; return ERROR;
} }