diff options
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index b4d0be2b7ce9..cfeb85cff4f0 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -263,10 +263,8 @@ void build_ehash_secret(void) | |||
| 263 | get_random_bytes(&rnd, sizeof(rnd)); | 263 | get_random_bytes(&rnd, sizeof(rnd)); |
| 264 | } while (rnd == 0); | 264 | } while (rnd == 0); |
| 265 | 265 | ||
| 266 | if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0) { | 266 | if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0) |
| 267 | get_random_bytes(&ipv6_hash_secret, sizeof(ipv6_hash_secret)); | 267 | get_random_bytes(&ipv6_hash_secret, sizeof(ipv6_hash_secret)); |
| 268 | net_secret_init(); | ||
| 269 | } | ||
| 270 | } | 268 | } |
| 271 | EXPORT_SYMBOL(build_ehash_secret); | 269 | EXPORT_SYMBOL(build_ehash_secret); |
| 272 | 270 | ||
| @@ -1532,18 +1530,6 @@ int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align) | |||
| 1532 | } | 1530 | } |
| 1533 | EXPORT_SYMBOL_GPL(snmp_mib_init); | 1531 | EXPORT_SYMBOL_GPL(snmp_mib_init); |
| 1534 | 1532 | ||
| 1535 | void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ]) | ||
| 1536 | { | ||
| 1537 | int i; | ||
| 1538 | |||
| 1539 | BUG_ON(ptr == NULL); | ||
| 1540 | for (i = 0; i < SNMP_ARRAY_SZ; i++) { | ||
| 1541 | free_percpu(ptr[i]); | ||
| 1542 | ptr[i] = NULL; | ||
| 1543 | } | ||
| 1544 | } | ||
| 1545 | EXPORT_SYMBOL_GPL(snmp_mib_free); | ||
| 1546 | |||
| 1547 | #ifdef CONFIG_IP_MULTICAST | 1533 | #ifdef CONFIG_IP_MULTICAST |
| 1548 | static const struct net_protocol igmp_protocol = { | 1534 | static const struct net_protocol igmp_protocol = { |
| 1549 | .handler = igmp_rcv, | 1535 | .handler = igmp_rcv, |
