diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-24 14:45:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-24 14:45:09 -0700 |
| commit | ec550d246e38e1b4ea8604b5c71ccb72e38f3290 (patch) | |
| tree | 0874238f764a2fa45a84d1b24b98f4989db67b47 | |
| parent | c32d83c0420950754cca01557bc5802793948d66 (diff) | |
| download | op-kernel-dev-ec550d246e38e1b4ea8604b5c71ccb72e38f3290.zip op-kernel-dev-ec550d246e38e1b4ea8604b5c71ccb72e38f3290.tar.gz | |
net: ip_append_data() optim
Compiler is not smart enough to avoid a conditional branch.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/ip_output.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6d2753c..e427620 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -837,10 +837,9 @@ int ip_append_data(struct sock *sk, inet->cork.length = 0; sk->sk_sndmsg_page = NULL; sk->sk_sndmsg_off = 0; - if ((exthdrlen = rt->dst.header_len) != 0) { - length += exthdrlen; - transhdrlen += exthdrlen; - } + exthdrlen = rt->dst.header_len; + length += exthdrlen; + transhdrlen += exthdrlen; } else { rt = (struct rtable *)inet->cork.dst; if (inet->cork.flags & IPCORK_OPT) |
