Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[pandora-kernel.git] / include / linux / if_pppol2tp.h

diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 516203b..a7d6a22 100644 (file)
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -32,8 +32,8 @@ struct pppol2tp_addr
 
        struct sockaddr_in addr;        /* IP address and port to send to */
 
-       __be16 s_tunnel, s_session;     /* For matching incoming packets */
-       __be16 d_tunnel, d_session;     /* For sending outgoing packets */
+       __u16 s_tunnel, s_session;      /* For matching incoming packets */
+       __u16 d_tunnel, d_session;      /* For sending outgoing packets */
 };
 
 /* Socket options: