diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/ipv4/syncookies.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/ipv4/syncookies.c')
| -rw-r--r-- | net/ipv4/syncookies.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index c86624b36a62..c0c75688896e 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c | |||
| @@ -170,7 +170,8 @@ u32 __cookie_v4_init_sequence(const struct iphdr *iph, const struct tcphdr *th, | |||
| 170 | } | 170 | } |
| 171 | EXPORT_SYMBOL_GPL(__cookie_v4_init_sequence); | 171 | EXPORT_SYMBOL_GPL(__cookie_v4_init_sequence); |
| 172 | 172 | ||
| 173 | __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mssp) | 173 | __u32 cookie_v4_init_sequence(struct sock *sk, const struct sk_buff *skb, |
| 174 | __u16 *mssp) | ||
| 174 | { | 175 | { |
| 175 | const struct iphdr *iph = ip_hdr(skb); | 176 | const struct iphdr *iph = ip_hdr(skb); |
| 176 | const struct tcphdr *th = tcp_hdr(skb); | 177 | const struct tcphdr *th = tcp_hdr(skb); |