diff --git a/subsys/net/ip/l2/ieee802154/ieee802154.c b/subsys/net/ip/l2/ieee802154/ieee802154.c index 511a2993654..5f67850f0f4 100644 --- a/subsys/net/ip/l2/ieee802154/ieee802154.c +++ b/subsys/net/ip/l2/ieee802154/ieee802154.c @@ -317,8 +317,7 @@ NET_L2_INIT(IEEE802154_L2, void ieee802154_init(struct net_if *iface) { struct ieee802154_context *ctx = net_if_l2_data(iface); - const struct ieee802154_radio_api *radio = - iface->dev->driver_api; + const struct ieee802154_radio_api *radio = iface->dev->driver_api; const u8_t *mac = iface->link_addr.addr; u8_t long_addr[8]; @@ -333,9 +332,6 @@ void ieee802154_init(struct net_if *iface) #endif sys_memcpy_swap(long_addr, mac, 8); - - radio->set_ieee_addr(iface->dev, long_addr); - memcpy(ctx->ext_addr, long_addr, 8); ieee802154_filter_ieee_addr(iface, ctx->ext_addr); diff --git a/subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c b/subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c index 93871dd15a5..351d27ad4b0 100644 --- a/subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c +++ b/subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c @@ -116,7 +116,6 @@ static int ieee802154_scan(u32_t mgmt_request, struct net_if *iface, ctx->scan_ctx = scan; ret = 0; - radio->set_pan_id(iface->dev, IEEE802154_BROADCAST_PAN_ID); ieee802154_filter_pan_id(iface, IEEE802154_BROADCAST_PAN_ID); if (radio->start(iface->dev)) { @@ -164,7 +163,6 @@ static int ieee802154_scan(u32_t mgmt_request, struct net_if *iface, } /* Let's come back to context's settings */ - radio->set_pan_id(iface->dev, ctx->pan_id); ieee802154_filter_pan_id(iface, ctx->pan_id); radio->set_channel(iface->dev, ctx->channel); out: @@ -397,11 +395,8 @@ static int ieee802154_set_parameters(u32_t mgmt_request, } } else if (mgmt_request == NET_REQUEST_IEEE802154_SET_PAN_ID) { if (ctx->pan_id != value) { - ret = radio->set_pan_id(iface->dev, value); - if (!ret) { - ctx->pan_id = value; - ieee802154_filter_pan_id(iface, ctx->pan_id); - } + ctx->pan_id = value; + ieee802154_filter_pan_id(iface, ctx->pan_id); } } else if (mgmt_request == NET_REQUEST_IEEE802154_SET_EXT_ADDR) { if (len != IEEE802154_EXT_ADDR_LENGTH) { @@ -409,22 +404,13 @@ static int ieee802154_set_parameters(u32_t mgmt_request, } if (memcmp(ctx->ext_addr, data, IEEE802154_EXT_ADDR_LENGTH)) { - ret = radio->set_ieee_addr(iface->dev, (u8_t *)data); - if (!ret) { - memcpy(ctx->ext_addr, data, - IEEE802154_EXT_ADDR_LENGTH); - ieee802154_filter_ieee_addr(iface, - ctx->ext_addr); - } + memcpy(ctx->ext_addr, data, IEEE802154_EXT_ADDR_LENGTH); + ieee802154_filter_ieee_addr(iface, ctx->ext_addr); } } else if (mgmt_request == NET_REQUEST_IEEE802154_SET_SHORT_ADDR) { if (ctx->short_addr != value) { - ret = radio->set_short_addr(iface->dev, value); - if (!ret) { - ctx->short_addr = value; - ieee802154_filter_short_addr(iface, - ctx->short_addr); - } + ctx->short_addr = value; + ieee802154_filter_short_addr(iface, ctx->short_addr); } } else if (mgmt_request == NET_REQUEST_IEEE802154_SET_TX_POWER) { if (ctx->tx_power != (s16_t)value) {