diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/inet_timewait_sock.h | 3 | ||||
-rw-r--r-- | include/net/ip.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index f1a770977c4f..180231c5bbbe 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
@@ -126,7 +126,8 @@ struct inet_timewait_sock { | |||
126 | /* And these are ours. */ | 126 | /* And these are ours. */ |
127 | unsigned int tw_ipv6only : 1, | 127 | unsigned int tw_ipv6only : 1, |
128 | tw_transparent : 1, | 128 | tw_transparent : 1, |
129 | tw_pad : 14, /* 14 bits hole */ | 129 | tw_pad : 6, /* 6 bits hole */ |
130 | tw_tos : 8, | ||
130 | tw_ipv6_offset : 16; | 131 | tw_ipv6_offset : 16; |
131 | kmemcheck_bitfield_end(flags); | 132 | kmemcheck_bitfield_end(flags); |
132 | unsigned long tw_ttd; | 133 | unsigned long tw_ttd; |
diff --git a/include/net/ip.h b/include/net/ip.h index c7e066a1c611..eca0ef7a495e 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -165,6 +165,7 @@ struct ip_reply_arg { | |||
165 | int csumoffset; /* u16 offset of csum in iov[0].iov_base */ | 165 | int csumoffset; /* u16 offset of csum in iov[0].iov_base */ |
166 | /* -1 if not needed */ | 166 | /* -1 if not needed */ |
167 | int bound_dev_if; | 167 | int bound_dev_if; |
168 | u8 tos; | ||
168 | }; | 169 | }; |
169 | 170 | ||
170 | #define IP_REPLY_ARG_NOSRCCHECK 1 | 171 | #define IP_REPLY_ARG_NOSRCCHECK 1 |
@@ -175,7 +176,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg) | |||
175 | } | 176 | } |
176 | 177 | ||
177 | void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr, | 178 | void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr, |
178 | struct ip_reply_arg *arg, unsigned int len); | 179 | const struct ip_reply_arg *arg, unsigned int len); |
179 | 180 | ||
180 | struct ipv4_config { | 181 | struct ipv4_config { |
181 | int log_martians; | 182 | int log_martians; |