From patchwork Mon Dec 14 19:55:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 556610 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 3EB721402BB for ; Tue, 15 Dec 2015 06:55:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=p57Sz34/; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753267AbbLNTzs (ORCPT ); Mon, 14 Dec 2015 14:55:48 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36708 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752892AbbLNTzq (ORCPT ); Mon, 14 Dec 2015 14:55:46 -0500 Received: by mail-wm0-f52.google.com with SMTP id n186so134529215wmn.1; Mon, 14 Dec 2015 11:55:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vuzM1GjJ7QqIypAzU1l1pJvsmG+txB6QK//XcpLetYk=; b=p57Sz34/gUi0Dd4ytaZHMx6zY6owO0X4fOD2BrbfpCFD2fzNpsV8ViFC823mLu4045 XJMM1klCTEhKOqADN0SCfWc6Qsfm3jbUBMuOXFU8ca+CbnWyMys3GMaTiurrh69eGnOy unw5b0SqFrD1HshPeedr0Ft7cZtg3ijvf950IxZfYdWrXr3E/7/iIZ+26x6LPUxvdp9Y 5EX73/iLTZHY+j5+dvC7CwlUmPiBECMFP9bJwb9pTHKk2rHCUJsw72bUqUlo0mIOK18q 8Fbtd7rm4MiObf8oHR8rBTXVcjYCbPPBFK5kUXgH+cTIlbG80K+6gbcTUHAAl7iYhqJx 50Ig== X-Received: by 10.194.173.102 with SMTP id bj6mr39061426wjc.180.1450122945049; Mon, 14 Dec 2015 11:55:45 -0800 (PST) Received: from omega.localdomain (p20030064A90B1446E2CB4EFFFE1BB546.dip0.t-ipconnect.de. [2003:64:a90b:1446:e2cb:4eff:fe1b:b546]) by smtp.gmail.com with ESMTPSA id xs9sm3676408wjc.43.2015.12.14.11.55.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 11:55:44 -0800 (PST) From: Alexander Aring To: linux-wpan@vger.kernel.org Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, kernel@pengutronix.de, Alexander Aring , "David S . Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH net-next] ipv6: addrconf: drop ieee802154 specific things Date: Mon, 14 Dec 2015 20:55:22 +0100 Message-Id: <1450122922-3174-1-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.6.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch removes ARPHRD_IEEE802154 from addrconf handling. In the earlier days of 802.15.4 6LoWPAN, the interface type was ARPHRD_IEEE802154 which introduced several issues, because 802.15.4 interfaces used the same type. Since commit 965e613d299c ("ieee802154: 6lowpan: fix ARPHRD to ARPHRD_6LOWPAN") we use ARPHRD_6LOWPAN for 6LoWPAN interfaces. This patch will remove ARPHRD_IEEE802154 which is currently deadcode, because ARPHRD_IEEE802154 doesn't reach the minimum 1280 MTU of IPv6. Also we use 6LoWPAN EUI64 specific defines instead using link-layer constanst from 802.15.4 link-layer header. Cc: David S. Miller Cc: Alexey Kuznetsov Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Signed-off-by: Alexander Aring --- net/ipv6/addrconf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5e9111d..7082fb7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -70,7 +70,7 @@ #include #include -#include +#include #include #include #include @@ -1947,9 +1947,9 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp) static int addrconf_ifid_eui64(u8 *eui, struct net_device *dev) { - if (dev->addr_len != IEEE802154_ADDR_LEN) + if (dev->addr_len != EUI64_ADDR_LEN) return -1; - memcpy(eui, dev->dev_addr, 8); + memcpy(eui, dev->dev_addr, EUI64_ADDR_LEN); eui[0] ^= 2; return 0; } @@ -2041,7 +2041,6 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev) case ARPHRD_IPGRE: return addrconf_ifid_gre(eui, dev); case ARPHRD_6LOWPAN: - case ARPHRD_IEEE802154: return addrconf_ifid_eui64(eui, dev); case ARPHRD_IEEE1394: return addrconf_ifid_ieee1394(eui, dev); @@ -3066,7 +3065,6 @@ static void addrconf_dev_config(struct net_device *dev) (dev->type != ARPHRD_FDDI) && (dev->type != ARPHRD_ARCNET) && (dev->type != ARPHRD_INFINIBAND) && - (dev->type != ARPHRD_IEEE802154) && (dev->type != ARPHRD_IEEE1394) && (dev->type != ARPHRD_TUNNEL6) && (dev->type != ARPHRD_6LOWPAN)) {