d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate code for walking through the early static env data. This code

Browse Source 
is called from a device attach routine, and thus cannot be called before
the cutover from static to dynamic kernel env.
This commit is contained in:
Ian Lepore 2016-01-03 14:46:19 +00:00
parent 7aa9d7375e
commit 3e0aa2f449
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/rt/if_rt.c
View File

@ -227,20 +227,6 @@ macaddr_atoi(const char *str, uint8_t *mac)
} }
#ifdef USE_GENERATED_MAC_ADDRESS #ifdef USE_GENERATED_MAC_ADDRESS
static char *
kernenv_next(char *cp)
{
if (cp != NULL) {
while (*cp != 0)
cp++;
cp++;
if (*cp == 0)
cp = NULL;
}
return (cp);
}
/* /*
* generate_mac(uin8_t *mac) * generate_mac(uin8_t *mac)
* This is MAC address generator for cases when real device MAC address * This is MAC address generator for cases when real device MAC address
@ -259,14 +245,8 @@ generate_mac(uint8_t *mac)
uint32_t crc = 0xffffffff; uint32_t crc = 0xffffffff;
/* Generate CRC32 on kenv */ /* Generate CRC32 on kenv */
if (dynamic_kenv) { for (cp = kenvp[0]; cp != NULL; cp = kenvp[++i]) {
for (cp = kenvp[0]; cp != NULL; cp = kenvp[++i]) { crc = calculate_crc32c(crc, cp, strlen(cp) + 1);
crc = calculate_crc32c(crc, cp, strlen(cp) + 1);
}
} else {
for (cp = kern_envp; cp != NULL; cp = kernenv_next(cp)) {
crc = calculate_crc32c(crc, cp, strlen(cp) + 1);
}
} }
crc = ~crc; crc = ~crc;