diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/net/secure_seq.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/net/secure_seq.h')
| -rw-r--r-- | include/net/secure_seq.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h index 6ca975bebd37..f257486f17be 100644 --- a/include/net/secure_seq.h +++ b/include/net/secure_seq.h | |||
| @@ -3,19 +3,18 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | extern void net_secret_init(void); | 6 | __u32 secure_ip_id(__be32 daddr); |
| 7 | extern __u32 secure_ip_id(__be32 daddr); | 7 | __u32 secure_ipv6_id(const __be32 daddr[4]); |
| 8 | extern __u32 secure_ipv6_id(const __be32 daddr[4]); | 8 | u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); |
| 9 | extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); | 9 | u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, |
| 10 | extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, | 10 | __be16 dport); |
| 11 | __be16 dport); | 11 | __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, |
| 12 | extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, | 12 | __be16 sport, __be16 dport); |
| 13 | __be16 sport, __be16 dport); | 13 | __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, |
| 14 | extern __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, | 14 | __be16 sport, __be16 dport); |
| 15 | __be16 sport, __be16 dport); | 15 | u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr, |
| 16 | extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr, | 16 | __be16 sport, __be16 dport); |
| 17 | __be16 sport, __be16 dport); | 17 | u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, |
| 18 | extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, | 18 | __be16 sport, __be16 dport); |
| 19 | __be16 sport, __be16 dport); | ||
| 20 | 19 | ||
| 21 | #endif /* _NET_SECURE_SEQ */ | 20 | #endif /* _NET_SECURE_SEQ */ |