From patchwork Sun Aug 7 14:30:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 9266365 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6B2160754 for ; Sun, 7 Aug 2016 14:33:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8FCC26C2F for ; Sun, 7 Aug 2016 14:33:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD94127E5A; Sun, 7 Aug 2016 14:33:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5690926C2F for ; Sun, 7 Aug 2016 14:33:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751745AbcHGOdJ (ORCPT ); Sun, 7 Aug 2016 10:33:09 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:40446 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101AbcHGOdH (ORCPT ); Sun, 7 Aug 2016 10:33:07 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=omega.localdomain) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1bWP8S-0001Um-Cg; Sun, 07 Aug 2016 16:33:04 +0200 From: Alexander Aring To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, linux-bluetooth@vger.kernel.org, Alexander Aring Subject: [RFCv2 bluetooth-next 18/19] 6lowpan: move addr_len setting away from generic Date: Sun, 7 Aug 2016 16:30:55 +0200 Message-Id: <20160807143056.3116-19-aar@pengutronix.de> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160807143056.3116-1-aar@pengutronix.de> References: <20160807143056.3116-1-aar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: aar@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wpan@vger.kernel.org Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The address length for BTLE 6LoWPAN is not 8 bytes, it's 6 bytes. We need to move this setting away from generic branch. Signed-off-by: Alexander Aring --- net/6lowpan/core.c | 1 - net/ieee802154/6lowpan/core.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net/6lowpan/core.c b/net/6lowpan/core.c index 6b7de14..e03cecf 100644 --- a/net/6lowpan/core.c +++ b/net/6lowpan/core.c @@ -58,7 +58,6 @@ int lowpan_register_netdevice(struct net_device *dev, { int i, ret; - dev->addr_len = EUI64_ADDR_LEN; dev->type = ARPHRD_6LOWPAN; dev->mtu = IPV6_MIN_MTU; dev->priv_flags |= IFF_NO_QUEUE; diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c index a60abad..c97eb7a 100644 --- a/net/ieee802154/6lowpan/core.c +++ b/net/ieee802154/6lowpan/core.c @@ -134,6 +134,7 @@ static int lowpan_newlink(struct net *src_net, struct net_device *ldev, } lowpan_802154_dev(ldev)->wdev = wdev; + ldev->addr_len = IEEE802154_ADDR_LEN; /* Set the lowpan hardware address to the wpan hardware address. */ memcpy(ldev->dev_addr, wdev->dev_addr, IEEE802154_ADDR_LEN); /* We need headroom for possible wpan_dev_hard_header call and tailroom