Skip to content

Merging few patches from net to master #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 3, 2017
Merged

Merging few patches from net to master #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464545e
net: tcp: Mark ACK timer as cancelled
jukkar Apr 24, 2017
6b62d2f
net: bt: Fix not setting lladdr type
Vudentz May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions subsys/net/ip/l2/bluetooth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions subsys/net/ip/tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down