[net-next,10/15] 6lowpan: use the PANID provided by the device instead of a static value

Submitted by Tony Cheneau on Oct. 23, 2012, 4:09 a.m.

Details

Message ID 1350965397-12384-11-git-send-email-tony.cheneau@amnesiak.org
State Changes Requested
Delegated to: David Miller
Headers show

Commit Message

Tony Cheneau Oct. 23, 2012, 4:09 a.m.
Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
---
 net/ieee802154/6lowpan.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index f8fcdae..9711038 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -584,10 +584,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 short address */
 		if (lowpan_is_addr_broadcast(daddr)) {