From 51cf5e71bbb3db50670a88588fc5f5837c9c99da Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Mon, 11 Aug 2014 08:38:58 -0700 Subject: [PATCH] datapath/actions: Mark recalculate_csum as likely in set_ipv6_addr(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ‘recalculate_csum’ is almost always ‘true’. It is false only if the ipv6 nexthdr is an extension header, and a routing header is found. For the majority of ipv6 packets this would not be the case, so this can be marked as 'likely'. Signed-off-by: Jarno Rajahalme Acked-by: Jesse Gross --- datapath/actions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/actions.c b/datapath/actions.c index 4ca86f420..25c5d7725 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -394,7 +394,7 @@ static void set_ipv6_addr(struct sk_buff *skb, u8 l4_proto, __be32 addr[4], const __be32 new_addr[4], bool recalculate_csum) { - if (recalculate_csum) + if (likely(recalculate_csum)) update_ipv6_checksum(skb, l4_proto, addr, new_addr); skb_clear_hash(skb); -- 2.39.5