File tree Expand file tree Collapse file tree 7 files changed +10
-11
lines changed
Expand file tree Collapse file tree 7 files changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -31,8 +31,7 @@ struct hippi_cb {
3131 __u32 ifield ;
3232};
3333
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 );
3635
3736extern struct net_device * alloc_hippi_dev (int sizeof_priv );
3837#endif
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ struct fcllc {
4444 __u8 ssap ; /* source SAP */
4545 __u8 llc ; /* LLC control field */
4646 __u8 protid [3 ]; /* protocol id */
47- __u16 ethertype ; /* ether type field */
47+ __be16 ethertype ; /* ether type field */
4848};
4949
5050#endif /* _LINUX_IF_FC_H */
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ struct fddi_snap_hdr
8585 __u8 ssap ; /* always 0xAA */
8686 __u8 ctrl ; /* always 0x03 */
8787 __u8 oui [FDDI_K_OUI_LEN ]; /* organizational universal id */
88- __u16 ethertype ; /* packet type ID field */
88+ __be16 ethertype ; /* packet type ID field */
8989 } __attribute__ ((packed ));
9090
9191/* Define FDDI LLC frame header */
Original file line number Diff line number Diff line change @@ -102,9 +102,9 @@ struct hippi_fp_hdr
102102#error "Please fix <asm/byteorder.h>"
103103#endif
104104#else
105- __u32 fixed ;
105+ __be32 fixed ;
106106#endif
107- __u32 d2_size ;
107+ __be32 d2_size ;
108108} __attribute__ ((packed ));
109109
110110struct hippi_le_hdr
@@ -144,7 +144,7 @@ struct hippi_snap_hdr
144144 __u8 ssap ; /* always 0xAA */
145145 __u8 ctrl ; /* always 0x03 */
146146 __u8 oui [HIPPI_OUI_LEN ]; /* organizational universal id (zero)*/
147- __u16 ethertype ; /* packet type ID field */
147+ __be16 ethertype ; /* packet type ID field */
148148} __attribute__ ((packed ));
149149
150150struct hippi_hdr
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ static int fc_rebuild_header(struct sk_buff *skb)
8787 struct fch_hdr * fch = (struct fch_hdr * )skb -> data ;
8888 struct fcllc * fcllc = (struct fcllc * )(skb -> data + sizeof (struct fch_hdr ));
8989 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 ));
9191 return 0 ;
9292 }
9393#ifdef CONFIG_INET
Original file line number Diff line number Diff line change @@ -108,8 +108,8 @@ static int fddi_rebuild_header(struct sk_buff *skb)
108108 else
109109#endif
110110 {
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 ));
113113 return (0 );
114114 }
115115}
Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ static int hippi_rebuild_header(struct sk_buff *skb)
124124 * Determine the packet's protocol ID.
125125 */
126126
127- unsigned short hippi_type_trans (struct sk_buff * skb , struct net_device * dev )
127+ __be16 hippi_type_trans (struct sk_buff * skb , struct net_device * dev )
128128{
129129 struct hippi_hdr * hip ;
130130
You can’t perform that action at this time.
0 commit comments