diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /net/dccp/output.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
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 36bcc00654d3..c0e88c16d088 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
| @@ -350,7 +350,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, | |||
| 350 | /* Reserve space for headers. */ | 350 | /* Reserve space for headers. */ |
| 351 | skb_reserve(skb, sk->sk_prot->max_header); | 351 | skb_reserve(skb, sk->sk_prot->max_header); |
| 352 | 352 | ||
| 353 | skb->dst = dst_clone(dst); | 353 | skb_dst_set(skb, dst_clone(dst)); |
| 354 | 354 | ||
| 355 | dreq = dccp_rsk(req); | 355 | dreq = dccp_rsk(req); |
| 356 | if (inet_rsk(req)->acked) /* increase ISS upon retransmission */ | 356 | if (inet_rsk(req)->acked) /* increase ISS upon retransmission */ |