diff options
| author | Octavian Purdila <octavian.purdila@intel.com> | 2014-06-25 17:09:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-27 15:53:35 -0700 |
| commit | 476eab8251641ea2ae4666ca8a1436ebc2b8e9c3 (patch) | |
| tree | 0340d1b0bc5520c413720a619bd476e26c56d916 /net/dccp/ipv6.c | |
| parent | aa27fc501850030fb5d1ee705feb836ee6a21f2a (diff) | |
| download | linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.tar.gz linux-476eab8251641ea2ae4666ca8a1436ebc2b8e9c3.tar.bz2 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 'net/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 4db3c2a1679c..04cb17d4b0ce 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -386,7 +386,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) goto drop; - req = inet6_reqsk_alloc(&dccp6_request_sock_ops); + req = inet_reqsk_alloc(&dccp6_request_sock_ops); if (req == NULL) goto drop; |