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,
 
                 /* 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