diff options
author | David S. Miller <davem@outer-richmond.davemloft.net> | 2005-09-10 00:01:36 -0700 |
---|---|---|
committer | David S. Miller <davem@outer-richmond.davemloft.net> | 2005-09-10 00:01:36 -0700 |
commit | 41c29dd15b5c36bacdb06ee11facb9199d0b2de0 (patch) | |
tree | 0b929a5d7b60f0477886e9b08c670fa91a821ff8 /net/dccp/ipv4.c | |
parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
parent | 59d203f9e989c81defc2cb1c559d678e16dbe684 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index fee9a8c3777..2afaa464e7f 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -641,16 +641,12 @@ int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code) skb = dccp_make_reset(sk, sk->sk_dst_cache, code); if (skb != NULL) { - const struct dccp_sock *dp = dccp_sk(sk); const struct inet_sock *inet = inet_sk(sk); err = ip_build_and_send_pkt(skb, sk, inet->saddr, inet->daddr, NULL); if (err == NET_XMIT_CN) err = 0; - - ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); - ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); } return err; |