diff options
| author | Octavian Purdila | 2014-06-25 16:09:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-06-28 00:53:35 +0200 |
| commit | 476eab8251641ea2ae4666ca8a1436ebc2b8e9c3 (patch) | |
| tree | 0340d1b0bc5520c413720a619bd476e26c56d916 /include/net/inet_sock.h | |
| parent | tcp: tcp_v[46]_conn_request: fix snt_synack initialization (diff) | |
| download | kernel-qcow2-linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.tar.gz kernel-qcow2-linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.tar.xz kernel-qcow2-linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.zip | |
net: remove inet6_reqsk_alloc
Since pktops is only used for IPv6 only and opts is used for IPv4
only, we can move these fields into a union and this allows us to drop
the inet6_reqsk_alloc function as after this change it becomes
equivalent with inet_reqsk_alloc.
This patch also fixes a kmemcheck issue in the IPv6 stack: the flags
field was not annotated after a request_sock was allocated.
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index b1edf17bec01..a829b77523cf 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -88,8 +88,10 @@ struct inet_request_sock { acked : 1, no_srccheck: 1; kmemcheck_bitfield_end(flags); - struct ip_options_rcu *opt; - struct sk_buff *pktopts; + union { + struct ip_options_rcu *opt; + struct sk_buff *pktopts; + }; u32 ir_mark; }; |