From patchwork Sat May 3 00:21:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 345287 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 5B8AF1400F6 for ; Sat, 3 May 2014 10:21:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbaECAVJ (ORCPT ); Fri, 2 May 2014 20:21:09 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33650 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751366AbaECAVH (ORCPT ); Fri, 2 May 2014 20:21:07 -0400 Received: by mail-pa0-f53.google.com with SMTP id kp14so1738438pab.12 for ; Fri, 02 May 2014 17:21:06 -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=Rj9lQ0X/cD0X7hmGVpzmu6n1tEO4p8rqiBw+S3EXDeQ=; b=gXizCqXQzdRlUkyD4wA0hDrR7VMsYldlWZn93ZWeNEWX5Nssh5tx/9ZDBD110rEVRp TBXaWglzTDCll4xTfNuOiZFRgIIePMbmUXXjCOVLqwBNnP30DtcP+fzTerpnqflHKZFq f4IErE3D4XkAmgupUl9DJawMLw71xMZhbE425CxToIlnmQhIK343i4H+a/k/tgND6OhC v6JOEXE6u3tDA26iPxwSwqRU19+y9GRjS9PFN08rQt33RhI8VRrqbp7bGKn09N4a0ODU HT8ay8+jDj+G4sQfTS7IL9+cn4Skz6DClW/vdMkJA8EDNUtztsd7CFLm0At1fPtZRiy3 o6IQ== X-Received: by 10.66.136.131 with SMTP id qa3mr40330456pab.77.1399076466263; Fri, 02 May 2014 17:21:06 -0700 (PDT) Received: from localhost.net ([8.25.197.25]) by mx.google.com with ESMTPSA id z3sm3870779pas.15.2014.05.02.17.21.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 May 2014 17:21:05 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: "David S. Miller" , Cong Wang , Nicolas Dichtel Subject: [Patch net-next] ipv6: remove unused function ipv6_inherit_linklocal() Date: Fri, 2 May 2014 17:21:01 -0700 Message-Id: <1399076461-12172-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is no longer used after commit e837735ec406a347756e (ip6_tunnel: ensure to always have a link local address). Cc: Nicolas Dichtel Signed-off-by: Cong Wang Acked-by: Nicolas Dichtel --- net/ipv6/addrconf.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index fc203db..1ac13c0 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2818,18 +2818,6 @@ static void addrconf_gre_config(struct net_device *dev) } #endif -static inline int -ipv6_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev) -{ - struct in6_addr lladdr; - - if (!ipv6_get_lladdr(link_dev, &lladdr, IFA_F_TENTATIVE)) { - addrconf_add_linklocal(idev, &lladdr); - return 0; - } - return -1; -} - static int addrconf_notify(struct notifier_block *this, unsigned long event, void *ptr) {