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/ipv6/ip6_tunnel.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/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 4919f9294e2a..80a11909159d 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -748,7 +748,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
748 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, | 748 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, |
749 | skb->dst->dev, dst_output); | 749 | skb->dst->dev, dst_output); |
750 | 750 | ||
751 | if (err == NET_XMIT_SUCCESS || err == NET_XMIT_CN) { | 751 | if (net_xmit_eval(err) == 0) { |
752 | stats->tx_bytes += pkt_len; | 752 | stats->tx_bytes += pkt_len; |
753 | stats->tx_packets++; | 753 | stats->tx_packets++; |
754 | } else { | 754 | } else { |