[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6] / include / linux / in.h

diff --git a/include/linux/in.h b/include/linux/in.h
index 94f557fa46369ec94ec718d25616ceb0b73fd2d2..bcaca8399aed62006eb601272771dbfe7c997039 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
@@ -177,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'. */