diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-20 19:25:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 19:25:24 -0800 |
| commit | 017487d7d1e905a5bb529f6a2bc8cf8ea14e2307 (patch) | |
| tree | 6a68904ea48ccae0c4c17f7dc248831fd46bd3e6 /net/dccp/ipv4.c | |
| parent | e55d912f5b75723159348a7fc7692f869a86636a (diff) | |
| download | linux-3.10-017487d7d1e905a5bb529f6a2bc8cf8ea14e2307.tar.gz linux-3.10-017487d7d1e905a5bb529f6a2bc8cf8ea14e2307.tar.bz2 linux-3.10-017487d7d1e905a5bb529f6a2bc8cf8ea14e2307.zip | |
[DCCP]: Generalize dccp_v4_send_reset
Renaming it to dccp_send_reset and moving it from the ipv4 specific
code to the core dccp code.
This fixes some bugs in IPV6 where timers would send v4 resets, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index f94286e46c4..3baf4c76a89 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -457,32 +457,6 @@ void dccp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb) EXPORT_SYMBOL_GPL(dccp_v4_send_check); -int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code) -{ - struct sk_buff *skb; - /* - * FIXME: what if rebuild_header fails? - * Should we be doing a rebuild_header here? - */ - int err = inet_sk_rebuild_header(sk); - - if (err != 0) - return err; - - skb = dccp_make_reset(sk, sk->sk_dst_cache, code); - if (skb != NULL) { - const struct inet_sock *inet = inet_sk(sk); - - memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); - err = ip_build_and_send_pkt(skb, sk, - inet->saddr, inet->daddr, NULL); - if (err == NET_XMIT_CN) - err = 0; - } - - return err; -} - static inline u64 dccp_v4_init_sequence(const struct sock *sk, const struct sk_buff *skb) { |