diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /net/core/secure_seq.c | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 (diff) | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 (diff) | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
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 025233de25f9..925991ae6f52 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c | |||
| @@ -19,6 +19,7 @@ static int __init net_secret_init(void) | |||
| 19 | } | 19 | } |
| 20 | late_initcall(net_secret_init); | 20 | late_initcall(net_secret_init); |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_INET | ||
| 22 | static u32 seq_scale(u32 seq) | 23 | static u32 seq_scale(u32 seq) |
| 23 | { | 24 | { |
| 24 | /* | 25 | /* |
| @@ -33,6 +34,7 @@ static u32 seq_scale(u32 seq) | |||
| 33 | */ | 34 | */ |
| 34 | return seq + (ktime_to_ns(ktime_get_real()) >> 6); | 35 | return seq + (ktime_to_ns(ktime_get_real()) >> 6); |
| 35 | } | 36 | } |
| 37 | #endif | ||
| 36 | 38 | ||
| 37 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 39 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 38 | __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, | 40 | __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, |