Commit-ID: ec550d246e38e1b4ea8604b5c71ccb72e38f3290 Gitweb: http://git.kernel.org/tip/ec550d246e38e1b4ea8604b5c71ccb72e38f3290 Author: Eric Dumazet <eric.dumazet@xxxxxxxxx> AuthorDate: Tue, 24 Aug 2010 14:45:09 -0700 Committer: David S. Miller <davem@xxxxxxxxxxxxx> CommitDate: Tue, 24 Aug 2010 14:45:09 -0700 net: ip_append_data() optim Compiler is not smart enough to avoid a conditional branch. Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- 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) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html