hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/include/net/ipv6.h
....@@ -660,12 +660,8 @@
660660 /* more secured version of ipv6_addr_hash() */
661661 static inline u32 __ipv6_addr_jhash(const struct in6_addr *a, const u32 initval)
662662 {
663
- u32 v = (__force u32)a->s6_addr32[0] ^ (__force u32)a->s6_addr32[1];
664
-
665
- return jhash_3words(v,
666
- (__force u32)a->s6_addr32[2],
667
- (__force u32)a->s6_addr32[3],
668
- initval);
663
+ return jhash2((__force const u32 *)a->s6_addr32,
664
+ ARRAY_SIZE(a->s6_addr32), initval);
669665 }
670666
671667 static inline bool ipv6_addr_loopback(const struct in6_addr *a)
....@@ -1106,6 +1102,8 @@
11061102 void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info);
11071103 void ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu);
11081104
1105
+void inet6_cleanup_sock(struct sock *sk);
1106
+void inet6_sock_destruct(struct sock *sk);
11091107 int inet6_release(struct socket *sock);
11101108 int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
11111109 int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
....@@ -1248,7 +1246,7 @@
12481246 return 0;
12491247 }
12501248
1251
-static inline int ip6_sock_set_addr_preferences(struct sock *sk, bool val)
1249
+static inline int ip6_sock_set_addr_preferences(struct sock *sk, int val)
12521250 {
12531251 int ret;
12541252