Merge branch 'next' into for-linus

[mv-sheeva.git] / include / net / inet_sock.h

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index dced3f64f9757222d484aaba4529bf1f78e1301e..de0ecc71cf0388d944ec0a032b7ffe8453324a95 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -61,8 +61,8 @@ struct inet_request_sock {
        struct request_sock     req;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        u16                     inet6_rsk_offset;
-       /* 2 bytes hole, try to pack */
 #endif
+       __be16                  loc_port;
        __be32                  loc_addr;
        __be32                  rmt_addr;
        __be16                  rmt_port;