diff options
Diffstat (limited to 'drivers/ieee1394/eth1394.h')
-rw-r--r-- | drivers/ieee1394/eth1394.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ieee1394/eth1394.h b/drivers/ieee1394/eth1394.h index 4f3e2dd46f00..e1b5ea80f623 100644 --- a/drivers/ieee1394/eth1394.h +++ b/drivers/ieee1394/eth1394.h | |||
@@ -82,7 +82,7 @@ struct eth1394_priv { | |||
82 | 82 | ||
83 | struct eth1394hdr { | 83 | struct eth1394hdr { |
84 | unsigned char h_dest[ETH1394_ALEN]; /* destination eth1394 addr */ | 84 | unsigned char h_dest[ETH1394_ALEN]; /* destination eth1394 addr */ |
85 | unsigned short h_proto; /* packet type ID field */ | 85 | __be16 h_proto; /* packet type ID field */ |
86 | } __attribute__((packed)); | 86 | } __attribute__((packed)); |
87 | 87 | ||
88 | static inline struct eth1394hdr *eth1394_hdr(const struct sk_buff *skb) | 88 | static inline struct eth1394hdr *eth1394_hdr(const struct sk_buff *skb) |
@@ -99,13 +99,13 @@ typedef enum {ETH1394_GASP, ETH1394_WRREQ} eth1394_tx_type; | |||
99 | struct eth1394_uf_hdr { | 99 | struct eth1394_uf_hdr { |
100 | u16 lf:2; | 100 | u16 lf:2; |
101 | u16 res:14; | 101 | u16 res:14; |
102 | u16 ether_type; /* Ethernet packet type */ | 102 | __be16 ether_type; /* Ethernet packet type */ |
103 | } __attribute__((packed)); | 103 | } __attribute__((packed)); |
104 | #elif defined __LITTLE_ENDIAN_BITFIELD | 104 | #elif defined __LITTLE_ENDIAN_BITFIELD |
105 | struct eth1394_uf_hdr { | 105 | struct eth1394_uf_hdr { |
106 | u16 res:14; | 106 | u16 res:14; |
107 | u16 lf:2; | 107 | u16 lf:2; |
108 | u16 ether_type; | 108 | __be16 ether_type; |
109 | } __attribute__((packed)); | 109 | } __attribute__((packed)); |
110 | #else | 110 | #else |
111 | #error Unknown bit field type | 111 | #error Unknown bit field type |
@@ -117,7 +117,7 @@ struct eth1394_ff_hdr { | |||
117 | u16 lf:2; | 117 | u16 lf:2; |
118 | u16 res1:2; | 118 | u16 res1:2; |
119 | u16 dg_size:12; /* Datagram size */ | 119 | u16 dg_size:12; /* Datagram size */ |
120 | u16 ether_type; /* Ethernet packet type */ | 120 | __be16 ether_type; /* Ethernet packet type */ |
121 | u16 dgl; /* Datagram label */ | 121 | u16 dgl; /* Datagram label */ |
122 | u16 res2; | 122 | u16 res2; |
123 | } __attribute__((packed)); | 123 | } __attribute__((packed)); |
@@ -126,7 +126,7 @@ struct eth1394_ff_hdr { | |||
126 | u16 dg_size:12; | 126 | u16 dg_size:12; |
127 | u16 res1:2; | 127 | u16 res1:2; |
128 | u16 lf:2; | 128 | u16 lf:2; |
129 | u16 ether_type; | 129 | __be16 ether_type; |
130 | u16 dgl; | 130 | u16 dgl; |
131 | u16 res2; | 131 | u16 res2; |
132 | } __attribute__((packed)); | 132 | } __attribute__((packed)); |
@@ -207,11 +207,11 @@ struct eth1394_arp { | |||
207 | u16 opcode; /* ARP Opcode */ | 207 | u16 opcode; /* ARP Opcode */ |
208 | /* Above is exactly the same format as struct arphdr */ | 208 | /* Above is exactly the same format as struct arphdr */ |
209 | 209 | ||
210 | u64 s_uniq_id; /* Sender's 64bit EUI */ | 210 | __be64 s_uniq_id; /* Sender's 64bit EUI */ |
211 | u8 max_rec; /* Sender's max packet size */ | 211 | u8 max_rec; /* Sender's max packet size */ |
212 | u8 sspd; /* Sender's max speed */ | 212 | u8 sspd; /* Sender's max speed */ |
213 | u16 fifo_hi; /* hi 16bits of sender's FIFO addr */ | 213 | __be16 fifo_hi; /* hi 16bits of sender's FIFO addr */ |
214 | u32 fifo_lo; /* lo 32bits of sender's FIFO addr */ | 214 | __be32 fifo_lo; /* lo 32bits of sender's FIFO addr */ |
215 | u32 sip; /* Sender's IP Address */ | 215 | u32 sip; /* Sender's IP Address */ |
216 | u32 tip; /* IP Address of requested hw addr */ | 216 | u32 tip; /* IP Address of requested hw addr */ |
217 | }; | 217 | }; |