Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[deliverable/linux.git] / net / atm / lec.h

diff --git a/net/atm/lec.h b/net/atm/lec.h
index 984e8e6e083ae9b2ee03f5d631f61b38ab652910..99136babd5357a273a8c758b5d47116fc59d6dcf 100644 (file)
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -14,14 +14,14 @@
 #define LEC_HEADER_LEN 16
 
 struct lecdatahdr_8023 {
-       unsigned short le_header;
+       __be16 le_header;
        unsigned char h_dest[ETH_ALEN];
        unsigned char h_source[ETH_ALEN];
-       unsigned short h_type;
+       __be16 h_type;
 };
 
 struct lecdatahdr_8025 {
-       unsigned short le_header;
+       __be16 le_header;
        unsigned char ac_pad;
        unsigned char fc;
        unsigned char h_dest[ETH_ALEN];