projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
inet_timewait_sock.h
diff --git
a/include/net/inet_timewait_sock.h
b/include/net/inet_timewait_sock.h
index f1a770977c4f25c9fbe0f85270e73f0355694ca6..180231c5bbbe8335275aa4611467a31d0dcc8e3b 100644
(file)
--- a/
include/net/inet_timewait_sock.h
+++ b/
include/net/inet_timewait_sock.h
@@
-126,7
+126,8
@@
struct inet_timewait_sock {
/* And these are ours. */
unsigned int tw_ipv6only : 1,
tw_transparent : 1,
- tw_pad : 14, /* 14 bits hole */
+ tw_pad : 6, /* 6 bits hole */
+ tw_tos : 8,
tw_ipv6_offset : 16;
kmemcheck_bitfield_end(flags);
unsigned long tw_ttd;