diff options
| author | Octavian Purdila <octavian.purdila@intel.com> | 2014-06-25 18:09:52 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-28 02:53:35 +0400 |
| commit | 476eab8251641ea2ae4666ca8a1436ebc2b8e9c3 (patch) | |
| tree | 0340d1b0bc5520c413720a619bd476e26c56d916 /include/linux/ipv6.h | |
| parent | aa27fc501850030fb5d1ee705feb836ee6a21f2a (diff) | |
| download | linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.tar.xz | |
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/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 2faef339d8f2..c811300b0b0c 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -256,16 +256,6 @@ static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk) return inet_sk(__sk)->pinet6; } -static inline struct request_sock *inet6_reqsk_alloc(struct request_sock_ops *ops) -{ - struct request_sock *req = reqsk_alloc(ops); - - if (req) - inet_rsk(req)->pktopts = NULL; - - return req; -} - static inline struct raw6_sock *raw6_sk(const struct sock *sk) { return (struct raw6_sock *)sk; |