From 464545ea4c6f28293e76a18e4836386b1514eaf0 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Mon, 24 Apr 2017 17:21:14 +0300 Subject: [PATCH 1/2] net: tcp: Mark ACK timer as cancelled This is related to commit "net: tcp: Make sure ACK timer is not run if cancelled" which did not set the cancel flag when the timer was cancelled from tcp.c. Signed-off-by: Jukka Rissanen --- subsys/net/ip/tcp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c index eaa77a2370904..0447b81c07a68 100644 --- a/subsys/net/ip/tcp.c +++ b/subsys/net/ip/tcp.c @@ -216,6 +216,7 @@ int net_tcp_release(struct net_tcp *tcp) net_pkt_unref(pkt); } + tcp->ack_timer_cancelled = true; k_delayed_work_cancel(&tcp->ack_timer); k_timer_stop(&tcp->retry_timer); k_sem_reset(&tcp->connect_wait); From 6b62d2f6848f0959499d7df1fbf2827b0a548151 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 2 May 2017 10:01:47 +0300 Subject: [PATCH 2/2] net: bt: Fix not setting lladdr type When adding link-local address to the cache the type needs to be properly set as net_ipv6_addr_create_iid will attempt to use it when generating the IPv6 address. Jira: ZEP-2077 Signed-off-by: Luiz Augusto von Dentz --- subsys/net/ip/l2/bluetooth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/subsys/net/ip/l2/bluetooth.c b/subsys/net/ip/l2/bluetooth.c index 103555b18f410..1ce112f914f8a 100644 --- a/subsys/net/ip/l2/bluetooth.c +++ b/subsys/net/ip/l2/bluetooth.c @@ -138,6 +138,7 @@ static void ipsp_connected(struct bt_l2cap_chan *chan) ll.addr = ctxt->dst.val; ll.len = sizeof(ctxt->dst.val); + ll.type = NET_LINK_BLUETOOTH; /* Add remote link-local address to the nbr cache to avoid sending ns: * https://tools.ietf.org/html/rfc7668#section-3.2.3