diff options
Diffstat (limited to 'net/core/secure_seq.c')
| -rw-r--r-- | net/core/secure_seq.c | 13 | 
1 files changed, 6 insertions, 7 deletions
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c index 758f140b6bed..fb87e78a2cc7 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c @@ -45,8 +45,8 @@ static u32 seq_scale(u32 seq)  #endif  #if IS_ENABLED(CONFIG_IPV6) -u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, -				 __be16 sport, __be16 dport, u32 *tsoff) +u32 secure_tcpv6_seq_and_tsoff(const __be32 *saddr, const __be32 *daddr, +			       __be16 sport, __be16 dport, u32 *tsoff)  {  	const struct {  		struct in6_addr saddr; @@ -66,7 +66,7 @@ u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,  	*tsoff = sysctl_tcp_timestamps == 1 ? (hash >> 32) : 0;  	return seq_scale(hash);  } -EXPORT_SYMBOL(secure_tcpv6_sequence_number); +EXPORT_SYMBOL(secure_tcpv6_seq_and_tsoff);  u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,  			       __be16 dport) @@ -89,14 +89,13 @@ EXPORT_SYMBOL(secure_ipv6_port_ephemeral);  #ifdef CONFIG_INET -/* secure_tcp_sequence_number(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d), +/* secure_tcp_seq_and_tsoff(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d),   * but fortunately, `sport' cannot be 0 in any circumstances. If this changes,   * it would be easy enough to have the former function use siphash_4u32, passing   * the arguments as separate u32.   */ - -u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, -			       __be16 sport, __be16 dport, u32 *tsoff) +u32 secure_tcp_seq_and_tsoff(__be32 saddr, __be32 daddr, +			     __be16 sport, __be16 dport, u32 *tsoff)  {  	u64 hash;  	net_secret_init();  | 
