Skip to content
Commit 7d37e7d5 authored by Jukka Rissanen's avatar Jukka Rissanen
Browse files

Merge net branch into master



Main changes:

- TCP fixes
- BT IPSP fixes
- Changing networking code and samples to use printk()
- CoAP over DTLS server and client samples
- Telnet console support
- IEEE 802.15.4 driver for MCR20A

----------------------------------------------------------------
Andrei Emeltchenko (8):
      wpan_serial: Queue only full packet to RX queue
      drivers: cc2520: Remove unused TI_CC2520 Kconfig option
      net: Remove CONFIG_NET_IPV6_NO_ND config option
      net: tests: Correct project file for route tests
      net: Make NET_IPV6_ND configurable option
      net: Make NET_IPV6_DAD depends on NET_IPV6_ND
      net: Remove unused CONFIG_NET_IPV6_NO_DAD option
      net: Fix leaving NET_MAX_6LO_CONTEXTS set when 6lowpan deselected

Andy Ross (2):
      net: tcp: Make the connect callback on success, not transmission
      net: tcp: Issue connection callback on RST

Johann F (2):
      ext: mcux: add MCR20Overwrites.h
      samples: ieee802154: add MCR20A

Johann Fischer (3):
      drivers: ieee802154: add MCR20A driver
      boards: frdm_k64f: add pinmux settings for MCR20A
      samples: net: add configs for MCR20A

Jukka Rissanen (2):
      net: tcp: Only return -ETIMEDOUT if timeout>0 in connect
      net: echo-client: Add TCP support

Luiz Augusto von Dentz (3):
      net: bt: Fix not checking channel state
      net: bt: Fix warning when compiling without debug
      net: bt: Fix not checking for valid ll addresses

Malcolm Prinn (1):
      net: iface: Fix typo in net_if_down

Paul Sokolovsky (1):
      net: Set default NET_NBUF_RX_COUNT to 4.

Ravi kumar Veeramally (12):
      samples: net: Add DHCPv4 sample application README file
      net: tests: Fix invalid config option in 6lo tests
      net: Fix 80 line character limit
      net: Use lighter printk() instead of printf()
      net: samples: Use lighter printk() instead of printf()
      net: tests: Use lighter printk() instead of printf()
      net: samples: Fix config option
      doc: net: Fix networking documentation
      net: ip: Check error conditions and return false
      net: 6lo: Verify src and dst link layer addresses
      net: dhcpv4: Fix tiny style issues
      net: 6lo: Fix tiny style issues

Sergio Rodriguez (2):
      samples/coaps_server CoAP over DTLS server example app using mbedTLS
      samples/coaps_client CoAP over DTLS client example app using mbedTLS

Tomasz Bursztyka (18):
      drivers/console: Removing non existing Kconfig source
      misc/printk: Add a function to get the current hook function.
      net: ip: Add a useful macro to staticaly initialize a struct in_addr
      drivers/console: Add a basic telnet console
      samples/net: Add telnet console support on echo_server with qemu
      shell: Fix tiny style issues
      drivers/uart_console: Fix tiny style issues
      drivers/console: Making console input generic
      console/shell: Switch to generic console input
      shell: Make the command queue size configurable via Kconfig
      drivers/console/telnet: Provide minimal input handling.
      shell: If enabled, let's register telnet console as an input
      drivers/console/telnet: Add ground support for telnet commands
      net/ieee802154: Modify radio TX function signature
      net/ieee802154: Raise an error when data frame cannot be created
      net/6lo: Switch to NET_ERR/NET_WARN when relevant.
      net/shell: Fix format string
      drivers/console/telnet: Select TCP when telnet is selected

Vinicius Costa Gomes (2):
      samples/zoap: Update zoap samples documentation
      samples/zoap_server: Also listen on the unicast address

 boards/arm/frdm_k64f/pinmux.c                      |    7 +
 .../networking/ip-stack-architecture.rst           |   12 +-
 doc/subsystems/networking/networking.rst           |    3 +-
 drivers/console/Kconfig                            |   10 +-
 drivers/console/Kconfig.telnet                     |  124 ++
 drivers/console/Makefile                           |    1 +
 drivers/console/telnet_console.c                   |  558 ++++++++
 drivers/console/telnet_protocol.h                  |  125 ++
 drivers/console/uart_console.c                     |   17 +-
 drivers/ieee802154/Kconfig                         |  125 +-
 drivers/ieee802154/Makefile                        |    2 +
 drivers/ieee802154/ieee802154_cc2520.c             |   32 +-
 drivers/ieee802154/ieee802154_mcr20a.c             | 1462 ++++++++++++++++++++
 drivers/ieee802154/ieee802154_mcr20a.h             |  184 +++
 drivers/ieee802154/ieee802154_mcr20a_regs.h        |  590 ++++++++
 drivers/ieee802154/ieee802154_uart_pipe.c          |   10 +-
 ext/hal/nxp/mcux/Makefile                          |    4 +
 ext/hal/nxp/mcux/README                            |    8 +
 .../nxp/mcux/components/mcr20a/MCR20Overwrites.h   |  309 +++++
 ext/lib/crypto/mbedtls/configs/config-coap.h       |  102 ++
 include/drivers/console/console.h                  |   49 +
 include/drivers/console/telnet_console.h           |   37 +
 include/drivers/console/uart_console.h             |    6 -
 include/net/ieee802154_radio.h                     |    6 +-
 include/net/net_context.h                          |   37 +-
 include/net/net_ip.h                               |    5 +
 misc/printk.c                                      |   13 +
 samples/net/coaps_client/Makefile                  |   14 +
 samples/net/coaps_client/README.rst                |   53 +
 samples/net/coaps_client/prj_qemu_x86.conf         |   27 +
 samples/net/coaps_client/src/Makefile              |    7 +
 samples/net/coaps_client/src/coaps_client.c        |  447 ++++++
 samples/net/coaps_client/src/udp.c                 |  202 +++
 samples/net/coaps_client/src/udp.h                 |   23 +
 samples/net/coaps_client/src/udp_cfg.h             |   21 +
 samples/net/coaps_client/testcase.ini              |    4 +
 samples/net/coaps_server/Makefile                  |   14 +
 samples/net/coaps_server/README.rst                |   76 +
 samples/net/coaps_server/prj_qemu_x86.conf         |   30 +
 samples/net/coaps_server/src/Makefile              |    7 +
 samples/net/coaps_server/src/coaps_server.c        |  685 +++++++++
 samples/net/coaps_server/src/udp.c                 |  186 +++
 samples/net/coaps_server/src/udp.h                 |   24 +
 samples/net/coaps_server/src/udp_cfg.h             |   20 +
 samples/net/coaps_server/testcase.ini              |    4 +
 samples/net/dhcpv4_client/README.rst               |  161 +++
 samples/net/dns_client/prj_qemu_x86.conf           |    2 +-
 samples/net/echo_client/prj_frdm_k64f_mcr20a.conf  |   48 +
 samples/net/echo_client/src/Makefile               |    4 +
 samples/net/echo_client/src/echo-client.c          |  516 +++++--
 samples/net/echo_server/prj_cc2520.conf            |    2 -
 samples/net/echo_server/prj_frdm_k64f_mcr20a.conf  |   46 +
 samples/net/echo_server/prj_slip.conf              |   12 +-
 samples/net/echo_server/src/echo-server.c          |    5 +-
 samples/net/ieee802154/hw/prj.conf                 |    2 -
 samples/net/ieee802154/hw/prj_mcr20a.conf          |   45 +
 samples/net/ieee802154/hw/src/ieee802154_test.c    |   13 +-
 samples/net/ieee802154/qemu/prj.conf               |    2 -
 samples/net/leds_demo/src/leds-demo.c              |    5 +-
 samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf   |    2 +-
 samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf   |    2 +-
 samples/net/wpan_serial/src/main.c                 |   36 +-
 samples/net/wpanusb/src/wpanusb.c                  |   18 +-
 samples/net/zoap_client/README.rst                 |   46 +
 samples/net/zoap_client/README.txt                 |   54 -
 samples/net/zoap_client/src/zoap-client.c          |   34 +-
 samples/net/zoap_server/README.rst                 |   40 +
 samples/net/zoap_server/README.txt                 |   51 -
 samples/net/zoap_server/src/zoap-server.c          |   33 +-
 subsys/net/ip/6lo.c                                |   77 +-
 subsys/net/ip/Kconfig                              |    3 +-
 subsys/net/ip/Kconfig.ipv6                         |    7 +-
 subsys/net/ip/connection.c                         |   20 +-
 subsys/net/ip/dhcpv4.c                             |   41 +-
 subsys/net/ip/icmpv4.c                             |    8 +-
 subsys/net/ip/icmpv6.c                             |    8 +-
 subsys/net/ip/ipv6.c                               |   13 +-
 subsys/net/ip/l2/arp.c                             |    2 +-
 subsys/net/ip/l2/bluetooth.c                       |   27 +-
 subsys/net/ip/l2/ethernet.c                        |    2 +-
 subsys/net/ip/l2/ieee802154/ieee802154.c           |   18 +-
 subsys/net/ip/l2/ieee802154/ieee802154_frame.c     |    1 +
 .../net/ip/l2/ieee802154/ieee802154_radio_aloha.c  |    7 +-
 .../ip/l2/ieee802154/ieee802154_radio_csma_ca.c    |    7 +-
 .../net/ip/l2/ieee802154/ieee802154_radio_utils.h  |    7 +-
 subsys/net/ip/net_context.c                        |   23 +-
 subsys/net/ip/net_core.c                           |    6 +-
 subsys/net/ip/net_if.c                             |    2 +-
 subsys/net/ip/net_private.h                        |   15 +-
 subsys/net/ip/net_shell.c                          |    4 +-
 subsys/net/ip/route.c                              |    4 +-
 subsys/net/ip/rpl-of0.c                            |    2 +-
 subsys/net/ip/rpl.c                                |   13 +-
 subsys/shell/Kconfig                               |   11 +-
 subsys/shell/shell.c                               |   41 +-
 tests/net/6lo/prj.conf                             |    2 +-
 tests/net/arp/src/main.c                           |   12 +-
 tests/net/ieee802154/l2/prj.conf                   |    2 -
 .../net/ieee802154/l2/src/ieee802154_fake_driver.c |    4 +-
 tests/net/ip-addr/src/main.c                       |   11 +-
 tests/net/nbuf/src/main.c                          |   11 +-
 tests/net/route/prj.conf                           |   11 -
 tests/net/tcp/prj.conf                             |    1 -
 tests/net/udp/prj.conf                             |    1 -
 104 files changed, 6726 insertions(+), 559 deletions(-)
 create mode 100644 drivers/console/Kconfig.telnet
 create mode 100644 drivers/console/telnet_console.c
 create mode 100644 drivers/console/telnet_protocol.h
 create mode 100644 drivers/ieee802154/ieee802154_mcr20a.c
 create mode 100644 drivers/ieee802154/ieee802154_mcr20a.h
 create mode 100644 drivers/ieee802154/ieee802154_mcr20a_regs.h
 create mode 100644 ext/hal/nxp/mcux/components/mcr20a/MCR20Overwrites.h
 create mode 100644 ext/lib/crypto/mbedtls/configs/config-coap.h
 create mode 100644 include/drivers/console/console.h
 create mode 100644 include/drivers/console/telnet_console.h
 create mode 100644 samples/net/coaps_client/Makefile
 create mode 100644 samples/net/coaps_client/README.rst
 create mode 100644 samples/net/coaps_client/prj_qemu_x86.conf
 create mode 100644 samples/net/coaps_client/src/Makefile
 create mode 100644 samples/net/coaps_client/src/coaps_client.c
 create mode 100644 samples/net/coaps_client/src/udp.c
 create mode 100644 samples/net/coaps_client/src/udp.h
 create mode 100644 samples/net/coaps_client/src/udp_cfg.h
 create mode 100644 samples/net/coaps_client/testcase.ini
 create mode 100644 samples/net/coaps_server/Makefile
 create mode 100644 samples/net/coaps_server/README.rst
 create mode 100644 samples/net/coaps_server/prj_qemu_x86.conf
 create mode 100644 samples/net/coaps_server/src/Makefile
 create mode 100644 samples/net/coaps_server/src/coaps_server.c
 create mode 100644 samples/net/coaps_server/src/udp.c
 create mode 100644 samples/net/coaps_server/src/udp.h
 create mode 100644 samples/net/coaps_server/src/udp_cfg.h
 create mode 100644 samples/net/coaps_server/testcase.ini
 create mode 100644 samples/net/dhcpv4_client/README.rst
 create mode 100644 samples/net/echo_client/prj_frdm_k64f_mcr20a.conf
 create mode 100644 samples/net/echo_server/prj_frdm_k64f_mcr20a.conf
 create mode 100644 samples/net/ieee802154/hw/prj_mcr20a.conf
 create mode 100644 samples/net/zoap_client/README.rst
 delete mode 100644 samples/net/zoap_client/README.txt
 create mode 100644 samples/net/zoap_server/README.rst
 delete mode 100644 samples/net/zoap_server/README.txt

Change-Id: I6caced9d0ae41d2019fb30434141260471e2538e
Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
parents 0621eda3 7ad52b94
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment