diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-08-23 02:55:33 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:52:04 -0400 |
commit | b963dc1df78399a2166c2e6e3eb726a2dc98cf11 (patch) | |
tree | 5a14d7d2cf9bebaaa1591c457fc30a42c3000b6d /include/linux/if_pppox.h | |
parent | 53c03f5c9e3c05a2484ad6bb1d88c0aa54befa47 (diff) |
pppoe: endianness
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/if_pppox.h')
-rw-r--r-- | include/linux/if_pppox.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 43cfc9f0c07..40743e03284 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h | |||
@@ -40,7 +40,7 @@ | |||
40 | /************************************************************************ | 40 | /************************************************************************ |
41 | * PPPoE addressing definition | 41 | * PPPoE addressing definition |
42 | */ | 42 | */ |
43 | typedef __u16 sid_t; | 43 | typedef __be16 sid_t; |
44 | struct pppoe_addr{ | 44 | struct pppoe_addr{ |
45 | sid_t sid; /* Session identifier */ | 45 | sid_t sid; /* Session identifier */ |
46 | unsigned char remote[ETH_ALEN]; /* Remote address */ | 46 | unsigned char remote[ETH_ALEN]; /* Remote address */ |
@@ -90,8 +90,8 @@ struct sockaddr_pppol2tp { | |||
90 | #define PADS_CODE 0x65 | 90 | #define PADS_CODE 0x65 |
91 | #define PADT_CODE 0xa7 | 91 | #define PADT_CODE 0xa7 |
92 | struct pppoe_tag { | 92 | struct pppoe_tag { |
93 | __u16 tag_type; | 93 | __be16 tag_type; |
94 | __u16 tag_len; | 94 | __be16 tag_len; |
95 | char tag_data[0]; | 95 | char tag_data[0]; |
96 | } __attribute ((packed)); | 96 | } __attribute ((packed)); |
97 | 97 | ||
@@ -118,8 +118,8 @@ struct pppoe_hdr { | |||
118 | #error "Please fix <asm/byteorder.h>" | 118 | #error "Please fix <asm/byteorder.h>" |
119 | #endif | 119 | #endif |
120 | __u8 code; | 120 | __u8 code; |
121 | __u16 sid; | 121 | __be16 sid; |
122 | __u16 length; | 122 | __be16 length; |
123 | struct pppoe_tag tag[0]; | 123 | struct pppoe_tag tag[0]; |
124 | } __attribute__ ((packed)); | 124 | } __attribute__ ((packed)); |
125 | 125 | ||
@@ -152,7 +152,7 @@ struct pppox_sock { | |||
152 | union { | 152 | union { |
153 | struct pppoe_opt pppoe; | 153 | struct pppoe_opt pppoe; |
154 | } proto; | 154 | } proto; |
155 | unsigned short num; | 155 | __be16 num; |
156 | }; | 156 | }; |
157 | #define pppoe_dev proto.pppoe.dev | 157 | #define pppoe_dev proto.pppoe.dev |
158 | #define pppoe_ifindex proto.pppoe.ifindex | 158 | #define pppoe_ifindex proto.pppoe.ifindex |