From patchwork Sun Mar 12 08:19:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 737790 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 3vgv7k36btz9s7K for ; Sun, 12 Mar 2017 19:20:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BeYBJtOM"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933917AbdCLIUI (ORCPT ); Sun, 12 Mar 2017 04:20:08 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33774 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755723AbdCLITs (ORCPT ); Sun, 12 Mar 2017 04:19:48 -0400 Received: by mail-lf0-f66.google.com with SMTP id r36so9716400lfi.0; Sun, 12 Mar 2017 00:19:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=smxUq7KcgXn6PZnwwlmYvsAY75jVFYNae6LoYPHvf6I=; b=BeYBJtOMKauAKjSUKPf9el8XZ/K+rz/aiauMkowZsnZA9HYnLvYnPCbQt6c23Yf3qV K5TF6JsLfkHDyZE9tI0/6irPMhBt90nxgQuzjnLiewUCOnHL/RGBVDiBigXayeM+4nph HKKGZJkwZdr6MdpH3LhD4g9E+yRc4U86iddqRD9gmOkCcKMHaS3P/Bt1KbIEHWxUpCOC WCVNzLSvNsiVpbPCA1GO7OnI6IOGq+PM9meY5sMY1Pr/XIH7q5axh26rGCxUzlhnQ8A0 QDPWiyBekL1YHRXRejPjTuT67vEKW6Pz19S5SPDpKgJ9cmu2dMiO6jiRo1YgnwCEvdZ2 Z3MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=smxUq7KcgXn6PZnwwlmYvsAY75jVFYNae6LoYPHvf6I=; b=QDEVWn9E451/KVI1CSMYe/+3pN/HL/3MrTxTY2JjXaplfCqaaMQrH2IjuhvC0hbfgO 5l7H3OnKs+n+AT8t+vsajY43qN7T41DYtyobYrPUOS097/BxUlEO/FjkAc/n1itvIwny 7DHiv0lom6OPc34WHf8Of92KMO2kTDw6ebHj1wwMqNQjhi/du9pzIOiLO/qN0tXg+E1d uMECalbd24zo5eKG40aOgFmoL6AjgGMAiHzO1LJQxQeZfkeNNlxFTlFGw+f6dGfO2UHC J9kn6M5KwKGNOMP3v5AJE33SbuO/eaJ9ud90InzuzjeiuAtB4vtxkZLuIR96SEglmV3g laEQ== X-Gm-Message-State: AMke39nJ6WEQ/lu3+CZOXZpWq7SRpVHwsp5ovBX0XNq52t8PHU95zCq07gAOy0s1DPnp9g== X-Received: by 10.46.77.72 with SMTP id a69mr8498278ljb.104.1489306785960; Sun, 12 Mar 2017 00:19:45 -0800 (PST) Received: from vudentzs-t460s.pp.htv.fi (89-27-7-11.bb.dnainternet.fi. [89.27.7.11]) by smtp.gmail.com with ESMTPSA id i24sm2874937lfk.50.2017.03.12.00.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Mar 2017 00:19:45 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Cc: patrik.flykt@linux.intel.com, aar@pengutronix.de, jukka.rissanen@linux.intel.com, linux-wpan@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v7 4/6] ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration Date: Sun, 12 Mar 2017 10:19:36 +0200 Message-Id: <20170312081938.11700-5-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170312081938.11700-1-luiz.dentz@gmail.com> References: <20170312081938.11700-1-luiz.dentz@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Aring This patch adds support for 48 bit 6LoWPAN address length autoconfiguration which is the case for BTLE 6LoWPAN. Signed-off-by: Alexander Aring Signed-off-by: Luiz Augusto von Dentz Reviewed-by: Stefan Schmidt Acked-by: David S. Miller --- net/ipv6/addrconf.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 3a2025f..7756640 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2052,12 +2052,19 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp) __ipv6_dev_ac_dec(ifp->idev, &addr); } -static int addrconf_ifid_eui64(u8 *eui, struct net_device *dev) +static int addrconf_ifid_6lowpan(u8 *eui, struct net_device *dev) { - if (dev->addr_len != EUI64_ADDR_LEN) + switch (dev->addr_len) { + case ETH_ALEN: + return addrconf_ifid_eui48(eui, dev); + case EUI64_ADDR_LEN: + memcpy(eui, dev->dev_addr, EUI64_ADDR_LEN); + eui[0] ^= 2; + break; + default: return -1; - memcpy(eui, dev->dev_addr, EUI64_ADDR_LEN); - eui[0] ^= 2; + } + return 0; } @@ -2149,7 +2156,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev) case ARPHRD_TUNNEL: return addrconf_ifid_gre(eui, dev); case ARPHRD_6LOWPAN: - return addrconf_ifid_eui64(eui, dev); + return addrconf_ifid_6lowpan(eui, dev); case ARPHRD_IEEE1394: return addrconf_ifid_ieee1394(eui, dev); case ARPHRD_TUNNEL6: