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/dccp/output.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/dccp/output.c')
-rw-r--r-- | net/dccp/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index d06945c7d3df..809d803d5006 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -347,7 +347,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, | |||
347 | /* Build and checksum header */ | 347 | /* Build and checksum header */ |
348 | dh = dccp_zeroed_hdr(skb, dccp_header_size); | 348 | dh = dccp_zeroed_hdr(skb, dccp_header_size); |
349 | 349 | ||
350 | dh->dccph_sport = inet_sk(sk)->sport; | 350 | dh->dccph_sport = inet_rsk(req)->loc_port; |
351 | dh->dccph_dport = inet_rsk(req)->rmt_port; | 351 | dh->dccph_dport = inet_rsk(req)->rmt_port; |
352 | dh->dccph_doff = (dccp_header_size + | 352 | dh->dccph_doff = (dccp_header_size + |
353 | DCCP_SKB_CB(skb)->dccpd_opt_len) / 4; | 353 | DCCP_SKB_CB(skb)->dccpd_opt_len) / 4; |