Merge pull request ARMmbed#2548 from PelionIoT/sync_with_mbed_os

Sync with Mbed OS
artokin · Jan 18, 2021 · 33ac791 · 33ac791
2 parents ee34352 + 6f8b282
commit 33ac791
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 1 deletion.
diff --git a/source/Common_Protocols/tcp.c b/source/Common_Protocols/tcp.c
@@ -82,7 +82,7 @@ void tcp_test_drop_reset()
 }
 #endif
 
-#ifdef FEA_TRACE_SUPPORT
+#if defined(FEA_TRACE_SUPPORT) && MBED_CONF_MBED_TRACE_ENABLE && (MBED_TRACE_MAX_LEVEL >= TRACE_LEVEL_DEBUG)
 static const char *trace_tcp_flags(uint16_t flags)
 {
     static char buf[9];
@@ -1223,7 +1223,9 @@ buffer_t *tcp_up(buffer_t *buf)
         seg_len++;
     }
 
+#if defined(FEA_TRACE_SUPPORT) && MBED_CONF_MBED_TRACE_ENABLE && (MBED_TRACE_MAX_LEVEL >= TRACE_LEVEL_DEBUG)
     tr_debug("TCP_UP: dst_p=%d, src_p=%d, flags=%s", buf->dst_sa.port, buf->src_sa.port, trace_tcp_flags(flags));
+#endif
     /* clear flags that will be ignored */
     flags &= ~(TCP_FLAG_CWR | TCP_FLAG_ECE | TCP_FLAG_URG);
 

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2019 Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2019 Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, 2019 Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2016 by Andrey Butok. FNET Community.
 *
 ***************************************************************************

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2016 by Andrey Butok. FNET Community.
 *
 ***************************************************************************

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c b/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
@@ -1,5 +1,6 @@
 /**************************************************************************
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
 *

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
@@ -1,6 +1,7 @@
 /**************************************************************************
 *
 * Copyright (c) 2017, Arm Limited and affiliates.
+* SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Freescale Semiconductor, Inc.
 * Copyright 2003 by Motorola SPS.