1 files changed, 23 insertions, 1 deletions

diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index afb4e2cbc00a..bf809131eef7 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -40,6 +40,9 @@ static int mac802154_mlme_start_req(struct net_device *dev,
                                     u8 pan_coord, u8 blx,
                                     u8 coord_realign)
 {
+        struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev);
+        int rc = 0;
+
         BUG_ON(addr->mode != IEEE802154_ADDR_SHORT);
 
         mac802154_dev_set_pan_id(dev, addr->pan_id);
@@ -47,12 +50,31 @@ static int mac802154_mlme_start_req(struct net_device *dev,
         mac802154_dev_set_ieee_addr(dev);
         mac802154_dev_set_page_channel(dev, page, channel);
 
+        if (ops->llsec) {
+                struct ieee802154_llsec_params params;
+                int changed = 0;
+
+                params.coord_shortaddr = addr->short_addr;
+                changed |= IEEE802154_LLSEC_PARAM_COORD_SHORTADDR;
+
+                params.pan_id = addr->pan_id;
+                changed |= IEEE802154_LLSEC_PARAM_PAN_ID;
+
+                params.hwaddr = ieee802154_devaddr_from_raw(dev->dev_addr);
+                changed |= IEEE802154_LLSEC_PARAM_HWADDR;
+
+                params.coord_hwaddr = params.hwaddr;
+                changed |= IEEE802154_LLSEC_PARAM_COORD_HWADDR;
+
+                rc = ops->llsec->set_params(dev, &params, changed);
+        }
+
         /* FIXME: add validation for unused parameters to be sane
          * for SoftMAC
          */
         ieee802154_nl_start_confirm(dev, IEEE802154_SUCCESS);
 
-        return 0;
+        return rc;
 }
 
 static struct wpan_phy *mac802154_get_phy(const struct net_device *dev)