diff options
author | Tony Cheneau <tony.cheneau@amnesiak.org> | 2013-03-25 13:59:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-26 12:37:58 -0400 |
commit | 43de7aa6ac4e37eaf0a5e83adc0a79d61fe3a55a (patch) | |
tree | 315ef2a8663fac9ed4c2acfa9b767818b1b22ac8 /net/ieee802154/6lowpan.c | |
parent | c7d0ab28b4c51de50c1fded2502e47a37771b6c3 (diff) |
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/6lowpan.c')
-rw-r--r-- | net/ieee802154/6lowpan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index d1d4ee69da27..276971ba3ade 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c | |||
@@ -577,10 +577,12 @@ static int lowpan_header_create(struct sk_buff *skb, | |||
577 | 577 | ||
578 | /* prepare wpan address data */ | 578 | /* prepare wpan address data */ |
579 | sa.addr_type = IEEE802154_ADDR_LONG; | 579 | sa.addr_type = IEEE802154_ADDR_LONG; |
580 | sa.pan_id = 0xff; | 580 | sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev); |
581 | |||
581 | memcpy(&(sa.hwaddr), saddr, 8); | 582 | memcpy(&(sa.hwaddr), saddr, 8); |
583 | /* intra-PAN communications */ | ||
584 | da.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev); | ||
582 | 585 | ||
583 | da.pan_id = 0xff; | ||
584 | /* | 586 | /* |
585 | * if the destination address is the broadcast address, use the | 587 | * if the destination address is the broadcast address, use the |
586 | * corresponding short address | 588 | * corresponding short address |