projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ccn/fixes-for-4.8-v2' of git://git.linaro.org/people/pawel.moll/linux...
[deliverable/linux.git]
/
include
/
net
/
inet_sock.h
diff --git
a/include/net/inet_sock.h
b/include/net/inet_sock.h
index 012b1f91f3ec4e3b018fb1b900692342eaefe108..236a81034fefec203e27bb73b5a1e5d7d512f8d5 100644
(file)
--- a/
include/net/inet_sock.h
+++ b/
include/net/inet_sock.h
@@
-97,7
+97,12
@@
struct inet_request_sock {
u32 ir_mark;
union {
struct ip_options_rcu *opt;
- struct sk_buff *pktopts;
+#if IS_ENABLED(CONFIG_IPV6)
+ struct {
+ struct ipv6_txoptions *ipv6_opt;
+ struct sk_buff *pktopts;
+ };
+#endif
};
};
This page took
0.037016 seconds
and
5
git commands to generate.