2 files changed, 4 insertions, 12 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;
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;
 };