riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto_init: reduce scope of iface

Browse Source
This commit is contained in:
Martine Lenders 2014-10-14 14:32:09 +02:00
parent 19bf230de2
commit b9054e825a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/auto_init/auto_init.c
View File

@ -91,7 +91,6 @@
#ifdef MODULE_NET_IF
void auto_init_net_if(void)
{
int iface;
transceiver_type_t transceivers = 0;
#ifdef MODULE_AT86RF231
transceivers |= TRANSCEIVER_AT86RF231;
@ -114,6 +113,7 @@ void auto_init_net_if(void)
net_if_init();
if (transceivers != 0) {
int iface;
#if CPUID_ID_LEN && defined(MODULE_HASHES)
uint8_t cpuid[CPUID_ID_LEN];
@ -149,7 +149,7 @@ void auto_init_net_if(void)
#endif /* DEBUG_ENABLED */
#undef CONF_RADIO_ADDR
uint16_t hwaddr = HTONS((uint16_t)((hash_l + hash_h) % (1 << 16)));
uint16_t hwaddr = HTONS((uint16_t)((hash_l ^ hash_h) ^ ((hash_l ^ hash_h) >> 16)));
net_if_set_hardware_address(iface, hwaddr);
DEBUG("Auto init radio address on interface %d to 0x%04x\n", iface, hwaddr);
#else /* CPUID_ID_LEN && defined(MODULE_HASHES) */
@ -182,9 +182,6 @@ void auto_init_net_if(void)
DEBUG("Auto init interface %d\n", iface);
}
}
else {
iface = -1;
}
}
#endif /* MODULE_NET_IF */