From da0866a6a041bc64d19036d0ea1c60dd4515027c Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Tue, 13 Nov 2018 21:10:03 +0100
Subject: [PATCH] cc2538_rf: Remove PAN ID initialization from reset
---
cpu/cc2538/include/cc2538_rf.h | 1 -
cpu/cc2538/radio/cc2538_rf.c | 1 -
cpu/cc2538/radio/cc2538_rf_netdev.c | 3 ---
3 files changed, 5 deletions(-)
diff --git a/cpu/cc2538/include/cc2538_rf.h b/cpu/cc2538/include/cc2538_rf.h
index f623fdc556..40937e8274 100644
--- a/cpu/cc2538/include/cc2538_rf.h
+++ b/cpu/cc2538/include/cc2538_rf.h
@@ -57,7 +57,6 @@ extern "C" {
#define CC2538_RF_POWER_DEFAULT (IEEE802154_DEFAULT_TXPOWER) /**< Default output power in dBm */
#define CC2538_RF_CHANNEL_DEFAULT (IEEE802154_DEFAULT_CHANNEL)
-#define CC2538_RF_PANID_DEFAULT (IEEE802154_DEFAULT_PANID)
#define OUTPUT_POWER_MIN (-24) /**< Min output power in dBm */
#define OUTPUT_POWER_MAX (7) /**< Max output power in dBm */
diff --git a/cpu/cc2538/radio/cc2538_rf.c b/cpu/cc2538/radio/cc2538_rf.c
index 43fd9b2b6c..18b66f84cf 100644
--- a/cpu/cc2538/radio/cc2538_rf.c
+++ b/cpu/cc2538/radio/cc2538_rf.c
@@ -88,7 +88,6 @@ void cc2538_init(void)
cc2538_set_tx_power(CC2538_RF_POWER_DEFAULT);
cc2538_set_chan(CC2538_RF_CHANNEL_DEFAULT);
- cc2538_set_pan(CC2538_RF_PANID_DEFAULT);
cc2538_set_addr_long(cc2538_get_eui64_primary());
/* Select the observable signals (maximum of three) */
diff --git a/cpu/cc2538/radio/cc2538_rf_netdev.c b/cpu/cc2538/radio/cc2538_rf_netdev.c
index e63e610d9e..8f0c7b3703 100644
--- a/cpu/cc2538/radio/cc2538_rf_netdev.c
+++ b/cpu/cc2538/radio/cc2538_rf_netdev.c
@@ -353,7 +353,6 @@ static int _init(netdev_t *netdev)
cc2538_rf_t *dev = (cc2538_rf_t *) netdev;
_dev = netdev;
- uint16_t pan = cc2538_get_pan();
uint16_t chan = cc2538_get_chan();
uint16_t addr_short = cc2538_get_addr_short();
uint64_t addr_long = cc2538_get_addr_long();
@@ -361,8 +360,6 @@ static int _init(netdev_t *netdev)
netdev_ieee802154_reset(&dev->netdev);
/* Initialise netdev_ieee802154_t struct */
- netdev_ieee802154_set(&dev->netdev, NETOPT_NID,
- &pan, sizeof(pan));
netdev_ieee802154_set(&dev->netdev, NETOPT_CHANNEL,
&chan, sizeof(chan));
netdev_ieee802154_set(&dev->netdev, NETOPT_ADDRESS,
--
GitLab