diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:06:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:06:35 -0400 |
| commit | 5fdf11283e26719543eb5f9b68707e1af77eb875 (patch) | |
| tree | 2d9a3fe6909e013c0bd2f5fc4c5bf5996eff7b19 /net/ipv6/syncookies.c | |
| parent | 2be508d847392e431759e370d21cea9412848758 (diff) | |
| parent | fdc9314cbe027281b5440780692105d49b53cf2c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
netfilter: replace old NF_ARP calls with NFPROTO_ARP
netfilter: fix compilation error with NAT=n
netfilter: xt_recent: use proc_create_data()
netfilter: snmp nat leaks memory in case of failure
netfilter: xt_iprange: fix range inversion match
netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
pkt_sched: sch_generic: Fix oops in sch_teql
dccp: Port redirection support for DCCP
tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
netdev: change name dropping error codes
ipvs: Update CONFIG_IP_VS_IPV6 description and help text
Diffstat (limited to 'net/ipv6/syncookies.c')
| -rw-r--r-- | net/ipv6/syncookies.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index ec394cf5a19b..676c80b5b14b 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c | |||
| @@ -204,6 +204,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) | |||
| 204 | 204 | ||
| 205 | req->mss = mss; | 205 | req->mss = mss; |
| 206 | ireq->rmt_port = th->source; | 206 | ireq->rmt_port = th->source; |
| 207 | ireq->loc_port = th->dest; | ||
| 207 | ipv6_addr_copy(&ireq6->rmt_addr, &ipv6_hdr(skb)->saddr); | 208 | ipv6_addr_copy(&ireq6->rmt_addr, &ipv6_hdr(skb)->saddr); |
| 208 | ipv6_addr_copy(&ireq6->loc_addr, &ipv6_hdr(skb)->daddr); | 209 | ipv6_addr_copy(&ireq6->loc_addr, &ipv6_hdr(skb)->daddr); |
| 209 | if (ipv6_opt_accepted(sk, skb) || | 210 | if (ipv6_opt_accepted(sk, skb) || |