From patchwork Tue Mar 26 03:59:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cheneau X-Patchwork-Id: 231070 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 BA7DB2C00A8 for ; Tue, 26 Mar 2013 15:11:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754578Ab3CZELj (ORCPT ); Tue, 26 Mar 2013 00:11:39 -0400 Received: from ns.amnesiak.org ([95.130.11.136]:47123 "EHLO amnesiak.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531Ab3CZELU (ORCPT ); Tue, 26 Mar 2013 00:11:20 -0400 Received: from localhost (localhost [127.0.0.1]) by amnesiak.org (Postfix) with ESMTP id 9281B7E4E; Tue, 26 Mar 2013 05:03:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=amnesiak.org; s=remotebox2; t=1364270605; bh=7xQ1lY4zrG9Sw0NGlIFcwO1FWhEZmZbwmbcpHQELBFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EnAQ8tgLfAHN2Ne338QMv3CLsKtvry1Tj8TA64ldVqK1tZqZqvN+BUDXHNW8RJ/RI oHZPOzbDj/xJcwh51H4UaodYUtmw74iV4UYAtSSAO5F7+fJ7WL7l1Gd5HayhCSkCFk 9ESCPpdEM4Tji4lZyQQSOREMTtQr+apGOnukI+Zc= X-Virus-Scanned: amavisd-new at amnesiak.org Received: from amnesiak.org ([127.0.0.1]) by localhost (amnesiak.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9u_n3znwsGJw; Tue, 26 Mar 2013 05:02:50 +0100 (CET) Received: from localhost.localdomain (c-68-50-161-254.hsd1.md.comcast.net [68.50.161.254]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by amnesiak.org (Postfix) with ESMTPSA id BF9D67E33; Tue, 26 Mar 2013 04:59:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=amnesiak.org; s=remotebox2; t=1364270391; bh=7xQ1lY4zrG9Sw0NGlIFcwO1FWhEZmZbwmbcpHQELBFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bQ5BPp/AWdKkJehip20MWxh7vaZxFXBx8UNwCrvbvZEE6ngd0kZBJmE34pzVCF2j4 WXymGC791Ap2mz3se0o7mImDIScwrKbO38L+77u2VB0OOjrjoSxyCW4AALldeVaHcc JGO1+8/e/SnwlWptLFqzMHbshDgIIYv0lK/RGS9I= From: Tony Cheneau To: "David S. Miller" , Eric Dumazet Cc: Alan Ott , Alexander Smirnov , netdev@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net Subject: [PATCH v2 net-next 11/12] 6lowpan: use the PANID provided by the device instead of a static value Date: Mon, 25 Mar 2013 23:59:31 -0400 Message-Id: <1364270372-19430-12-git-send-email-tony.cheneau@amnesiak.org> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1364270372-19430-1-git-send-email-tony.cheneau@amnesiak.org> References: <1364270372-19430-1-git-send-email-tony.cheneau@amnesiak.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Tony Cheneau --- net/ieee802154/6lowpan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index d1d4ee6..276971b 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -577,10 +577,12 @@ static int lowpan_header_create(struct sk_buff *skb, /* prepare wpan address data */ sa.addr_type = IEEE802154_ADDR_LONG; - sa.pan_id = 0xff; + sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev); + memcpy(&(sa.hwaddr), saddr, 8); + /* intra-PAN communications */ + da.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev); - da.pan_id = 0xff; /* * if the destination address is the broadcast address, use the * corresponding short address