Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / include / net / inet_sock.h

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index b1edf17..a829b77 100644 (file)
--- 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;
 };