Received: with ECARTIS (v1.0.0; list netdev); Fri, 15 Apr 2005 17:55:01 -0700 (PDT) Received: from yue.st-paulia.net (yue.linux-ipv6.org [203.178.140.15]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id j3G0sslN012775 for ; Fri, 15 Apr 2005 17:54:54 -0700 Received: from localhost (localhost [127.0.0.1]) by yue.st-paulia.net (Postfix) with ESMTP id 3435A33CC2; Sat, 16 Apr 2005 09:57:13 +0900 (JST) Date: Sat, 16 Apr 2005 09:57:13 +0900 (JST) Message-Id: <20050416.095713.110297063.yoshfuji@linux-ipv6.org> To: davem@davemloft.net Cc: netdev@oss.sgi.com, tgohad@mvista.com, yoshfuji@linux-ipv6.or Subject: [PATCH] [IPV6]: Fix a branch prediction From: YOSHIFUJI Hideaki / =?iso-2022-jp?B?GyRCNUhGIzFRTEAbKEI=?= Organization: USAGI Project X-URL: http://www.yoshifuji.org/%7Ehideaki/ X-Fingerprint: 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA X-PGP-Key-URL: http://www.yoshifuji.org/%7Ehideaki/hideaki@yoshifuji.org.asc X-Face: "5$Al-.M>NJ%a'@hhZdQm:."qn~PA^gq4o*>iCFToq*bAi#4FRtx}enhuQKz7fNqQz\BYU] $~O_5m-9'}MIs`XGwIEscw;e5b>n"B_?j/AkL~i/MEaZBLP X-Mailer: Mew version 2.2 on Emacs 20.7 / Mule 4.1 (AOI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV 0.83/830/Thu Apr 14 13:44:31 2005 on oss.sgi.com X-Virus-Status: Clean X-archive-position: 1769 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: yoshfuji@linux-ipv6.org Precedence: bulk X-list: netdev Content-Length: 629 Lines: 21 From: Tushar Gohad Signed-off-by: Hideaki YOSHIFUJI ===== net/ipv6/addrconf.c 1.135 vs edited ===== --- 1.135/net/ipv6/addrconf.c 2005-03-31 09:34:56 +09:00 +++ edited/net/ipv6/addrconf.c 2005-04-16 09:48:15 +09:00 @@ -571,7 +571,7 @@ out2: read_unlock_bh(&addrconf_lock); - if (unlikely(err == 0)) + if (likely(err == 0)) notifier_call_chain(&inet6addr_chain, NETDEV_UP, ifa); else { kfree(ifa); -- Hideaki YOSHIFUJI @ USAGI Project Homepage: http://www.yoshifuji.org/~hideaki/ GPG FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA