Commit 57bf1451ac79640c5a0a4f31284c43539fac2903
Committed by
David S. Miller
1 parent
73eef4cddb
Exists in
master
and in
4 other branches
[NET]: net/802: more endian annotations
The rest of endian warnings now belongs to tr.c exclusively. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 7 changed files with 10 additions and 11 deletions Side-by-side Diff
include/linux/hippidevice.h
... | ... | @@ -31,8 +31,7 @@ |
31 | 31 | __u32 ifield; |
32 | 32 | }; |
33 | 33 | |
34 | -extern unsigned short hippi_type_trans(struct sk_buff *skb, | |
35 | - struct net_device *dev); | |
34 | +extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev); | |
36 | 35 | |
37 | 36 | extern struct net_device *alloc_hippi_dev(int sizeof_priv); |
38 | 37 | #endif |
include/linux/if_fc.h
include/linux/if_fddi.h
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | __u8 ssap; /* always 0xAA */ |
86 | 86 | __u8 ctrl; /* always 0x03 */ |
87 | 87 | __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ |
88 | - __u16 ethertype; /* packet type ID field */ | |
88 | + __be16 ethertype; /* packet type ID field */ | |
89 | 89 | } __attribute__ ((packed)); |
90 | 90 | |
91 | 91 | /* Define FDDI LLC frame header */ |
include/linux/if_hippi.h
... | ... | @@ -102,9 +102,9 @@ |
102 | 102 | #error "Please fix <asm/byteorder.h>" |
103 | 103 | #endif |
104 | 104 | #else |
105 | - __u32 fixed; | |
105 | + __be32 fixed; | |
106 | 106 | #endif |
107 | - __u32 d2_size; | |
107 | + __be32 d2_size; | |
108 | 108 | } __attribute__ ((packed)); |
109 | 109 | |
110 | 110 | struct hippi_le_hdr |
... | ... | @@ -144,7 +144,7 @@ |
144 | 144 | __u8 ssap; /* always 0xAA */ |
145 | 145 | __u8 ctrl; /* always 0x03 */ |
146 | 146 | __u8 oui[HIPPI_OUI_LEN]; /* organizational universal id (zero)*/ |
147 | - __u16 ethertype; /* packet type ID field */ | |
147 | + __be16 ethertype; /* packet type ID field */ | |
148 | 148 | } __attribute__ ((packed)); |
149 | 149 | |
150 | 150 | struct hippi_hdr |
net/802/fc.c
... | ... | @@ -87,7 +87,7 @@ |
87 | 87 | struct fch_hdr *fch=(struct fch_hdr *)skb->data; |
88 | 88 | struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr)); |
89 | 89 | if(fcllc->ethertype != htons(ETH_P_IP)) { |
90 | - printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(fcllc->ethertype)); | |
90 | + printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(fcllc->ethertype)); | |
91 | 91 | return 0; |
92 | 92 | } |
93 | 93 | #ifdef CONFIG_INET |
net/802/fddi.c
... | ... | @@ -108,8 +108,8 @@ |
108 | 108 | else |
109 | 109 | #endif |
110 | 110 | { |
111 | - printk("%s: Don't know how to resolve type %02X addresses.\n", | |
112 | - skb->dev->name, htons(fddi->hdr.llc_snap.ethertype)); | |
111 | + printk("%s: Don't know how to resolve type %04X addresses.\n", | |
112 | + skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype)); | |
113 | 113 | return(0); |
114 | 114 | } |
115 | 115 | } |
net/802/hippi.c