Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[powerpc.git] / include / linux / in.h

diff --git a/include/linux/in.h b/include/linux/in.h
index ba35538..bcaca83 100644 (file)
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -52,7 +52,7 @@ enum {
 
 /* Internet address. */
 struct in_addr {
-       __u32   s_addr;
+       __be32  s_addr;
 };
 
 #define IP_TOS         1
@@ -72,6 +72,7 @@ struct in_addr {
 #define IP_FREEBIND    15
 #define IP_IPSEC_POLICY        16
 #define IP_XFRM_POLICY 17
+#define IP_PASSSEC     18
 
 /* BSD compatibility */
 #define IP_RECVRETOPTS IP_RETOPTS
@@ -176,7 +177,7 @@ struct in_pktinfo
 #define __SOCK_SIZE__  16              /* sizeof(struct sockaddr)      */
 struct sockaddr_in {
   sa_family_t          sin_family;     /* Address family               */
-  unsigned short int   sin_port;       /* Port number                  */
+  __be16               sin_port;       /* Port number                  */
   struct in_addr       sin_addr;       /* Internet address             */
 
   /* Pad to size of `struct sockaddr'. */