From patchwork Tue Oct 8 03:36:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baker Zhang X-Patchwork-Id: 281313 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 74D962C007C for ; Tue, 8 Oct 2013 14:38:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753942Ab3JHDhq (ORCPT ); Mon, 7 Oct 2013 23:37:46 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33941 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869Ab3JHDhp (ORCPT ); Mon, 7 Oct 2013 23:37:45 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz1so8190345pad.16 for ; Mon, 07 Oct 2013 20:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Ty4ZXV5le1rqDZ6nM7aJNW75aGUwFOZtjLX8XrYvToY=; b=Gt6wpTPWqHA2K6XYQm84y0msg3SZAD9bDixeByeJBoi6E4YpwMNIVGjsH4fpDSFk0N YrUUnTaRvY1zsVmA4j/0WACgYdmr9mJTO6Z0ckfetMzF4oU8EQQdT6nYirGB9VLDv+us L56JNWE/xH/576/g9D2y9rG0yX/aGT1Ja3XYqXYi/PJp1K9tJLg7SDXYNuqS25CVb4IN eoBwo0c5aLj+cuqoL4dfI/cwxIvYLsDk8OGwzS6piDHLjqkHF/DTKfD6WqVLKvQpnj1I WEokQohQiAN7PsD+wVDy6i6rXpkIhKhHEnz3rhSCPDtqSip1pKsUcVgIXkPXGzIqghx1 q1Ow== X-Received: by 10.66.145.132 with SMTP id su4mr969202pab.11.1381203465318; Mon, 07 Oct 2013 20:37:45 -0700 (PDT) Received: from martin.my.domain ([222.128.2.191]) by mx.google.com with ESMTPSA id gg10sm36679539pbc.46.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 20:37:44 -0700 (PDT) From: baker.kernel@gmail.com To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "baker.zhang" Subject: [PATCH net-next] fib_trie: only calc for the un-first node Date: Tue, 8 Oct 2013 11:36:51 +0800 Message-Id: <1381203411-12047-1-git-send-email-baker.kernel@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "baker.zhang" This is a enhancement. for the first node in fib_trie, newpos is 0, bit is 1. Only for the leaf or node with unmatched key need calc pos. Signed-off-by: baker.zhang --- net/ipv4/fib_trie.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 45c74ba..ec9a9ef 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1117,12 +1117,8 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen) * first tnode need some special handling */ - if (tp) - pos = tp->pos+tp->bits; - else - pos = 0; - if (n) { + pos = tp ? tp->pos+tp->bits : 0; newpos = tkey_mismatch(key, pos, n->key); tn = tnode_new(n->key, newpos, 1); } else {