From patchwork Mon Dec 14 14:07:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 556516 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 52882140271 for ; Tue, 15 Dec 2015 01:08:41 +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=wg1WUzJI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbbLNOIg (ORCPT ); Mon, 14 Dec 2015 09:08:36 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:34638 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbbLNOIb (ORCPT ); Mon, 14 Dec 2015 09:08:31 -0500 Received: by mail-wm0-f45.google.com with SMTP id p66so63729518wmp.1; Mon, 14 Dec 2015 06:08:30 -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:in-reply-to:references; bh=m7ukSjmTTLDnVoAebAphFfeZMu4TNKZXBKs7vhgFyoQ=; b=wg1WUzJI43ZfoiSTk0nFqp/yF5/sU2j2UDYTNUEfnM/l5Kn2ky3IGGPwjprjcP9cD8 UxYZ2+RLL95Hbkf8l6yGpbMr4KylsrccE6f9forZMRgSWIW3+yXXj5PCtsuGAyyFIUGD pDBozdlmyMy1GA2TDQY+CUgJuamcnJgpCTVI570voUw5MCymtZUKuG6qzDbv7odON81J 46b96TC+uAyq+E4ff1KNTW/1q3f9TZq8M9PdymX1jgDkQo9OMY6l79421AC5KOw8F+aR ia5GWxTJG3UoSZeINXD9iVoZ3Nzlavj7DGmOY9MXJ/XsdYeMDbcX80L8fE8soGqI8lKt HIxg== X-Received: by 10.28.14.202 with SMTP id 193mr477179wmo.9.1450102109994; Mon, 14 Dec 2015 06:08:29 -0800 (PST) Received: from omega.localdomain (p20030064A9495027E2CB4EFFFE1BB546.dip0.t-ipconnect.de. [2003:64:a949:5027:e2cb:4eff:fe1b:b546]) by smtp.gmail.com with ESMTPSA id z10sm16250557wmg.4.2015.12.14.06.08.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 06:08:29 -0800 (PST) From: Alexander Aring To: linux-wpan@vger.kernel.org Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, kernel@pengutronix.de, mcr@sandelman.ca, lukasz.duda@nordicsemi.no, martin.gergeleit@hs-rm.de, Alexander Aring , Oleg Hahm Subject: [RFC radvd 1/2] device-linux: replace ARPHRD_IEEE802154 to ARPHRD_6LOWPAN Date: Mon, 14 Dec 2015 15:07:35 +0100 Message-Id: <1450102056-23107-2-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450102056-23107-1-git-send-email-alex.aring@gmail.com> References: <1450102056-23107-1-git-send-email-alex.aring@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch changes the ARPHRD_IEEE802154 to ARPHRD_6LOWPAN. The IEEE 802.15.4 6lowpan module changed the ARPHRD_IEEE802154 type to ARPHRD_6LOWPAN. Nowadays it's use ARPHRD_6LOWPAN which is also used by BTLE 6LoWPAN. Both interfaces uses an EUI64 address and the handling to get the link-layer address should be the same. There is no backward compatibility for 802.15.4 6LoWPAN before we changed the ARPHRD. Anyway if somebody wants that it should be patched manually. When the ARPHRD was ARPHRD_IEEE802154 the 802.15.4 6lowpan was anyway in a somehow unusable state. Cc: linux-bluetooth@vger.kernel.org Cc: linux-wpan@vger.kernel.org Cc: Oleg Hahm Signed-off-by: Alexander Aring --- device-linux.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/device-linux.c b/device-linux.c index de83f2e..7301927 100644 --- a/device-linux.c +++ b/device-linux.c @@ -22,6 +22,10 @@ #define IPV6_ADDR_LINKLOCAL 0x0020U #endif +#ifndef ARPHRD_6LOWPAN +#define ARPHRD_6LOWPAN 825 /* IPv6 over LoWPAN */ +#endif + static char const *hwstr(unsigned short sa_family); /* @@ -79,12 +83,10 @@ int update_device_info(int sock, struct Interface *iface) iface->sllao.if_maxmtu = -1; break; #endif /* ARPHDR_ARCNET */ -#ifdef ARPHRD_IEEE802154 - case ARPHRD_IEEE802154: + case ARPHRD_6LOWPAN: iface->sllao.if_hwaddr_len = 64; iface->sllao.if_prefix_len = 64; break; -#endif default: iface->sllao.if_hwaddr_len = -1; iface->sllao.if_prefix_len = -1; @@ -382,6 +384,9 @@ static char const *hwstr(unsigned short sa_family) rc = "ARPHRD_IEEE802154_PHY"; break; #endif + case ARPHRD_6LOWPAN: + rc = "ARPHRD_6LOWPAN"; + break; case ARPHRD_VOID: rc = "ARPHRD_VOID"; break;