aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ipv6.h
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevich@gmail.com>2015-01-31 10:40:13 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-02 22:28:04 -0500
commit366e41d9774d7010cb63112b6db2fce6dc7809c0 (patch)
treed29cf61b02e8b31f41373e82e710645c768de0e9 /include/linux/ipv6.h
parentba0c39cb98a1eec3635ae5f959fef963738d12a5 (diff)
ipv6: pull cork initialization into its own function.
Pull IPv6 cork initialization into its own function that can be re-used. IPv6 specific cork data did not have an explicit data structure. This patch creats eone so that just ipv6 cork data can be as arguemts. Also, since IPv6 tries to save the flow label into inet_cork_full tructure, pass the full cork. Adjust ip6_cork_release() to take cork data structures. Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ipv6.h')
-rw-r--r--include/linux/ipv6.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 2805062c013f..4d5169f5d7d1 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -125,6 +125,12 @@ struct ipv6_mc_socklist;
125struct ipv6_ac_socklist; 125struct ipv6_ac_socklist;
126struct ipv6_fl_socklist; 126struct ipv6_fl_socklist;
127 127
128struct inet6_cork {
129 struct ipv6_txoptions *opt;
130 u8 hop_limit;
131 u8 tclass;
132};
133
128/** 134/**
129 * struct ipv6_pinfo - ipv6 private area 135 * struct ipv6_pinfo - ipv6 private area
130 * 136 *
@@ -217,11 +223,7 @@ struct ipv6_pinfo {
217 struct ipv6_txoptions *opt; 223 struct ipv6_txoptions *opt;
218 struct sk_buff *pktoptions; 224 struct sk_buff *pktoptions;
219 struct sk_buff *rxpmtu; 225 struct sk_buff *rxpmtu;
220 struct { 226 struct inet6_cork cork;
221 struct ipv6_txoptions *opt;
222 u8 hop_limit;
223 u8 tclass;
224 } cork;
225}; 227};
226 228
227/* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */ 229/* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */