diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-11-14 08:21:36 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:27 -0500 |
commit | b9df3cb8cf9a96e63dfdcd3056a9cbc71f2459e7 (patch) | |
tree | 46d19124b1bbfd9eaa26af3d6ba2293b4e8f326d /net/dccp/ipv4.c | |
parent | 1ed176a801b83915b7c8ab80e0a2a6376a2d6051 (diff) |
[TCP/DCCP]: Introduce net_xmit_eval
Throughout the TCP/DCCP (and tunnelling) code, it often happens that the
return code of a transmit function needs to be tested against NET_XMIT_CN
which is a value that does not indicate a strict error condition.
This patch uses a macro for these recurring situations which is consistent
with the already existing macro net_xmit_errno, saving on duplicated code.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index bc400b2ba25e..61c09014dade 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -501,8 +501,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req, | |||
501 | err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, | 501 | err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, |
502 | ireq->rmt_addr, | 502 | ireq->rmt_addr, |
503 | ireq->opt); | 503 | ireq->opt); |
504 | if (err == NET_XMIT_CN) | 504 | err = net_xmit_eval(err); |
505 | err = 0; | ||
506 | } | 505 | } |
507 | 506 | ||
508 | out: | 507 | out: |
@@ -571,7 +570,7 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb) | |||
571 | rxskb->nh.iph->saddr, NULL); | 570 | rxskb->nh.iph->saddr, NULL); |
572 | bh_unlock_sock(dccp_v4_ctl_socket->sk); | 571 | bh_unlock_sock(dccp_v4_ctl_socket->sk); |
573 | 572 | ||
574 | if (err == NET_XMIT_CN || err == 0) { | 573 | if (net_xmit_eval(err) == 0) { |
575 | DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS); | 574 | DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS); |
576 | DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS); | 575 | DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS); |
577 | } | 576 | } |