aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/atalk.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/atalk.h')
-rw-r--r--include/linux/atalk.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 31d3fc25ccbd..911c09cb9bf9 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -1,6 +1,8 @@
1#ifndef __LINUX_ATALK_H__ 1#ifndef __LINUX_ATALK_H__
2#define __LINUX_ATALK_H__ 2#define __LINUX_ATALK_H__
3 3
4#include <asm/byteorder.h>
5
4/* 6/*
5 * AppleTalk networking structures 7 * AppleTalk networking structures
6 * 8 *
@@ -20,7 +22,7 @@
20#define SIOCATALKDIFADDR (SIOCPROTOPRIVATE + 0) 22#define SIOCATALKDIFADDR (SIOCPROTOPRIVATE + 0)
21 23
22struct atalk_addr { 24struct atalk_addr {
23 __u16 s_net; 25 __be16 s_net;
24 __u8 s_node; 26 __u8 s_node;
25}; 27};
26 28
@@ -33,8 +35,8 @@ struct sockaddr_at {
33 35
34struct atalk_netrange { 36struct atalk_netrange {
35 __u8 nr_phase; 37 __u8 nr_phase;
36 __u16 nr_firstnet; 38 __be16 nr_firstnet;
37 __u16 nr_lastnet; 39 __be16 nr_lastnet;
38}; 40};
39 41
40#ifdef __KERNEL__ 42#ifdef __KERNEL__
@@ -70,8 +72,8 @@ struct atalk_iface {
70struct atalk_sock { 72struct atalk_sock {
71 /* struct sock has to be the first member of atalk_sock */ 73 /* struct sock has to be the first member of atalk_sock */
72 struct sock sk; 74 struct sock sk;
73 unsigned short dest_net; 75 __be16 dest_net;
74 unsigned short src_net; 76 __be16 src_net;
75 unsigned char dest_node; 77 unsigned char dest_node;
76 unsigned char src_node; 78 unsigned char src_node;
77 unsigned char dest_port; 79 unsigned char dest_port;
@@ -95,9 +97,9 @@ struct ddpehdr {
95 deh_hops:4, 97 deh_hops:4,
96 deh_len:10; 98 deh_len:10;
97#endif 99#endif
98 __u16 deh_sum; 100 __be16 deh_sum;
99 __u16 deh_dnet; 101 __be16 deh_dnet;
100 __u16 deh_snet; 102 __be16 deh_snet;
101 __u8 deh_dnode; 103 __u8 deh_dnode;
102 __u8 deh_snode; 104 __u8 deh_snode;
103 __u8 deh_dport; 105 __u8 deh_dport;
@@ -142,24 +144,24 @@ struct ddpshdr {
142 144
143/* AppleTalk AARP headers */ 145/* AppleTalk AARP headers */
144struct elapaarp { 146struct elapaarp {
145 __u16 hw_type; 147 __be16 hw_type;
146#define AARP_HW_TYPE_ETHERNET 1 148#define AARP_HW_TYPE_ETHERNET 1
147#define AARP_HW_TYPE_TOKENRING 2 149#define AARP_HW_TYPE_TOKENRING 2
148 __u16 pa_type; 150 __be16 pa_type;
149 __u8 hw_len; 151 __u8 hw_len;
150 __u8 pa_len; 152 __u8 pa_len;
151#define AARP_PA_ALEN 4 153#define AARP_PA_ALEN 4
152 __u16 function; 154 __be16 function;
153#define AARP_REQUEST 1 155#define AARP_REQUEST 1
154#define AARP_REPLY 2 156#define AARP_REPLY 2
155#define AARP_PROBE 3 157#define AARP_PROBE 3
156 __u8 hw_src[ETH_ALEN] __attribute__ ((packed)); 158 __u8 hw_src[ETH_ALEN] __attribute__ ((packed));
157 __u8 pa_src_zero __attribute__ ((packed)); 159 __u8 pa_src_zero __attribute__ ((packed));
158 __u16 pa_src_net __attribute__ ((packed)); 160 __be16 pa_src_net __attribute__ ((packed));
159 __u8 pa_src_node __attribute__ ((packed)); 161 __u8 pa_src_node __attribute__ ((packed));
160 __u8 hw_dst[ETH_ALEN] __attribute__ ((packed)); 162 __u8 hw_dst[ETH_ALEN] __attribute__ ((packed));
161 __u8 pa_dst_zero __attribute__ ((packed)); 163 __u8 pa_dst_zero __attribute__ ((packed));
162 __u16 pa_dst_net __attribute__ ((packed)); 164 __be16 pa_dst_net __attribute__ ((packed));
163 __u8 pa_dst_node __attribute__ ((packed)); 165 __u8 pa_dst_node __attribute__ ((packed));
164}; 166};
165 167