projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20191012' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
net
/
ipv4
/
tcp_minisocks.c
diff --git
a/net/ipv4/tcp_minisocks.c
b/net/ipv4/tcp_minisocks.c
index
8bcaf25
..
bb140a5
100644
(file)
--- a/
net/ipv4/tcp_minisocks.c
+++ b/
net/ipv4/tcp_minisocks.c
@@
-266,6
+266,7
@@
void tcp_time_wait(struct sock *sk, int state, int timeo)
tw->tw_transparent = inet->transparent;
tw->tw_mark = sk->sk_mark;
+ tw->tw_priority = sk->sk_priority;
tw->tw_rcv_wscale = tp->rx_opt.rcv_wscale;
tcptw->tw_rcv_nxt = tp->rcv_nxt;
tcptw->tw_snd_nxt = tp->snd_nxt;