From patchwork Wed May 22 15:52:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 245649 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 E1C5F2C00AA for ; Thu, 23 May 2013 01:52:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756348Ab3EVPwq (ORCPT ); Wed, 22 May 2013 11:52:46 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:45410 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633Ab3EVPwp (ORCPT ); Wed, 22 May 2013 11:52:45 -0400 Received: by mail-pa0-f45.google.com with SMTP id lj1so1931569pab.32 for ; Wed, 22 May 2013 08:52:44 -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:x-mailer; bh=jlSPYsSUbyOX8FoSppEnTSz9eNF3+3uZBI6wfRNG1p4=; b=gX1GbIe0QspkhOdo7uQlqURhw0Uu2Us34LDey5R5Zyk6N/mN3LbXpQs5nAE/CYo0Mu xJqynQJRmlTT5zIw9SxFeJzlDI4Du3ijQ5AWFwZ/F6xBgUG6mm95yjIKp+yKIuAbrjTp cJiyN0IF2BizqouHGnC3oX+egYVWqF9NgFHg0DpU8/erKnwBQR589u4DVoE6uWQEr5/r o76sssiew9vsMZ+ZTWdfvlrDDCHhu548DFW/ILgh1WZZjjtu3/uKQOcsgsJ0dME3iU/x uT9CmQ6JrynBXweWKJqdyOgdipRw6x9L7KDNHUfXVgc89v5iWWpH9i+fvZ+9qH3yeQE6 9Ykw== X-Received: by 10.68.209.193 with SMTP id mo1mr8301674pbc.191.1369237964814; Wed, 22 May 2013 08:52:44 -0700 (PDT) Received: from localhost.localdomain (node-1bsh.pool-118-173.dynamic.totbb.net. [118.173.241.241]) by mx.google.com with ESMTPSA id cc15sm8639847pac.1.2013.05.22.08.52.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 May 2013 08:52:44 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: Hideaki YOSHIFUJI , "David S. Miller" , Cong Wang Subject: [Patch net-next] ipv6: use ipv6_addr_scope() helper Date: Wed, 22 May 2013 23:52:22 +0800 Message-Id: <1369237942-24533-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.7.7.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK could be replaced by ipv6_addr_scope(), which is slightly faster. Cc: Hideaki YOSHIFUJI Cc: David S. Miller Signed-off-by: Cong Wang --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index d684d23..bceaaa7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1126,8 +1126,7 @@ retry: ift = !max_addresses || ipv6_count_addresses(idev) < max_addresses ? - ipv6_add_addr(idev, &addr, tmp_plen, - ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, + ipv6_add_addr(idev, &addr, tmp_plen, ipv6_addr_scope(&addr), addr_flags) : NULL; if (IS_ERR_OR_NULL(ift)) { in6_ifa_put(ifp);