diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2016-01-03 14:46:19 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2016-01-03 14:46:19 +0000 |
| commit | 3e0aa2f449f2ca42d7f41f96ba6b69ef20cdbfad (patch) | |
| tree | ff1ba70b6f51b2ce18a87c8c8778e13b11bab977 /sys/dev/rt | |
| parent | 7aa9d7375e48bbeb86980538107167980efef112 (diff) | |
Notes
Diffstat (limited to 'sys/dev/rt')
| -rw-r--r-- | sys/dev/rt/if_rt.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c index 4deb8deccfdb..3d3a3f35623a 100644 --- a/sys/dev/rt/if_rt.c +++ b/sys/dev/rt/if_rt.c @@ -227,20 +227,6 @@ macaddr_atoi(const char *str, uint8_t *mac) } #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) * 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; /* Generate CRC32 on kenv */ - if (dynamic_kenv) { - for (cp = kenvp[0]; cp != NULL; cp = kenvp[++i]) { - 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); - } + for (cp = kenvp[0]; cp != NULL; cp = kenvp[++i]) { + crc = calculate_crc32c(crc, cp, strlen(cp) + 1); } crc = ~crc; |
