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/ipv4/tcp_output.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/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index f63e99aac2d5..6a8581ab9a23 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -484,13 +484,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, | |||
484 | 484 | ||
485 | tcp_enter_cwr(sk); | 485 | tcp_enter_cwr(sk); |
486 | 486 | ||
487 | /* NET_XMIT_CN is special. It does not guarantee, | 487 | return net_xmit_eval(err); |
488 | * that this packet is lost. It tells that device | ||
489 | * is about to start to drop packets or already | ||
490 | * drops some packets of the same priority and | ||
491 | * invokes us to send less aggressively. | ||
492 | */ | ||
493 | return err == NET_XMIT_CN ? 0 : err; | ||
494 | 488 | ||
495 | #undef SYSCTL_FLAG_TSTAMPS | 489 | #undef SYSCTL_FLAG_TSTAMPS |
496 | #undef SYSCTL_FLAG_WSCALE | 490 | #undef SYSCTL_FLAG_WSCALE |