diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-04 15:00:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-04 15:01:28 +0100 |
| commit | adaf4ed2abbd285c93808060924eeec3af483aee (patch) | |
| tree | 425c6c37c08af0b69efaa7457c9b428eda347c36 /net/core/secure_seq.c | |
| parent | ca3d30cc02f780f68771087040ce935add6ba2b7 (diff) | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
Merge commit 'v3.2-rc7' into x86/asm
Merge reason: Update from -rc4 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/core/secure_seq.c')
| -rw-r--r-- | net/core/secure_seq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c index 025233de25f..925991ae6f5 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c @@ -19,6 +19,7 @@ static int __init net_secret_init(void) } late_initcall(net_secret_init); +#ifdef CONFIG_INET static u32 seq_scale(u32 seq) { /* @@ -33,6 +34,7 @@ static u32 seq_scale(u32 seq) */ return seq + (ktime_to_ns(ktime_get_real()) >> 6); } +#endif #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, |