Merge commit '90199fdb6412836121f22a3d72faa08fcfdcd418' into nanostack_release_14_0_0_to_5_15

* commit '90199fdb6412836121f22a3d72faa08fcfdcd418':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from 0903b81..4a3c5c5

Author: Arto Kinnunen

features/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0

@@ -1,4 +1,4 @@
-Copyright 2017 Arm Limited and its affiliates 
+Copyright 2017, Pelion and affiliates.
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause

@@ -1,4 +1,4 @@
-Copyright 2017 Arm Limited and affiliates.
+Copyright 2017, Pelion and affiliates.
 SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without

features/nanostack/sal-stack-nanostack/nanostack/cca_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -197,11 +197,12 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
  * \param msg_ptr An allocated message pointer. This pointer is the responsibility of the service after this call.
  * \param msg_len The length of the message.
  * \param receive_resp_cb Callback pointer
+ * \param delay_tx Transmit may be delayed and this parameter define that
  *
  * \return Transaction ID of the DHCP transaction
  * \return 0, if error occurred.
  */
-uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb);
+uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx);
 
 /**
  * \brief Setting retransmission parameters.
@@ -225,6 +226,16 @@ void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, ui
  */
 void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address);
 
+/**
+ * \brief Get Round Trip time of the request
+ *
+ * get the elapsed time of the request from last message sent to server.
+ *
+ * \param msg_tr_id The message transaction ID.
+ *
+ */
+uint32_t dhcp_service_rtt_get(uint32_t msg_tr_id);
+
 /**
  * \brief Stops transactions for a message (retransmissions).
  *

features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/fhss_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/fhss_test_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");