summaryrefslogtreecommitdiff
path: root/net/ieee802154
diff options
context:
space:
mode:
authorTony Cheneau <tony.cheneau@amnesiak.org>2013-03-25 17:59:31 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-26 12:37:58 -0400
commit43de7aa6ac4e37eaf0a5e83adc0a79d61fe3a55a (patch)
tree315ef2a8663fac9ed4c2acfa9b767818b1b22ac8 /net/ieee802154
parentc7d0ab28b4c51de50c1fded2502e47a37771b6c3 (diff)
downloadlinux-3.10-43de7aa6ac4e37eaf0a5e83adc0a79d61fe3a55a.tar.gz
linux-3.10-43de7aa6ac4e37eaf0a5e83adc0a79d61fe3a55a.tar.bz2
linux-3.10-43de7aa6ac4e37eaf0a5e83adc0a79d61fe3a55a.zip
6lowpan: use the PANID provided by the device instead of a static value
Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/6lowpan.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index d1d4ee69da2..276971ba3ad 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