提交 57bf1451 编写于 作者: A Alexey Dobriyan 提交者: David S. Miller

[NET]: net/802: more endian annotations

The rest of endian warnings now belongs to tr.c exclusively.
Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 73eef4cd
...@@ -31,8 +31,7 @@ struct hippi_cb { ...@@ -31,8 +31,7 @@ struct hippi_cb {
__u32 ifield; __u32 ifield;
}; };
extern unsigned short hippi_type_trans(struct sk_buff *skb, extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
struct net_device *dev);
extern struct net_device *alloc_hippi_dev(int sizeof_priv); extern struct net_device *alloc_hippi_dev(int sizeof_priv);
#endif #endif
......
...@@ -44,7 +44,7 @@ struct fcllc { ...@@ -44,7 +44,7 @@ struct fcllc {
__u8 ssap; /* source SAP */ __u8 ssap; /* source SAP */
__u8 llc; /* LLC control field */ __u8 llc; /* LLC control field */
__u8 protid[3]; /* protocol id */ __u8 protid[3]; /* protocol id */
__u16 ethertype; /* ether type field */ __be16 ethertype; /* ether type field */
}; };
#endif /* _LINUX_IF_FC_H */ #endif /* _LINUX_IF_FC_H */
...@@ -85,7 +85,7 @@ struct fddi_snap_hdr ...@@ -85,7 +85,7 @@ struct fddi_snap_hdr
__u8 ssap; /* always 0xAA */ __u8 ssap; /* always 0xAA */
__u8 ctrl; /* always 0x03 */ __u8 ctrl; /* always 0x03 */
__u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */
__u16 ethertype; /* packet type ID field */ __be16 ethertype; /* packet type ID field */
} __attribute__ ((packed)); } __attribute__ ((packed));
/* Define FDDI LLC frame header */ /* Define FDDI LLC frame header */
......
...@@ -102,9 +102,9 @@ struct hippi_fp_hdr ...@@ -102,9 +102,9 @@ struct hippi_fp_hdr
#error "Please fix <asm/byteorder.h>" #error "Please fix <asm/byteorder.h>"
#endif #endif
#else #else
__u32 fixed; __be32 fixed;
#endif #endif
__u32 d2_size; __be32 d2_size;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct hippi_le_hdr struct hippi_le_hdr
...@@ -144,7 +144,7 @@ struct hippi_snap_hdr ...@@ -144,7 +144,7 @@ struct hippi_snap_hdr
__u8 ssap; /* always 0xAA */ __u8 ssap; /* always 0xAA */
__u8 ctrl; /* always 0x03 */ __u8 ctrl; /* always 0x03 */
__u8 oui[HIPPI_OUI_LEN]; /* organizational universal id (zero)*/ __u8 oui[HIPPI_OUI_LEN]; /* organizational universal id (zero)*/
__u16 ethertype; /* packet type ID field */ __be16 ethertype; /* packet type ID field */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct hippi_hdr struct hippi_hdr
......
...@@ -87,7 +87,7 @@ static int fc_rebuild_header(struct sk_buff *skb) ...@@ -87,7 +87,7 @@ static int fc_rebuild_header(struct sk_buff *skb)
struct fch_hdr *fch=(struct fch_hdr *)skb->data; struct fch_hdr *fch=(struct fch_hdr *)skb->data;
struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr)); struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
if(fcllc->ethertype != htons(ETH_P_IP)) { if(fcllc->ethertype != htons(ETH_P_IP)) {
printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(fcllc->ethertype)); printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(fcllc->ethertype));
return 0; return 0;
} }
#ifdef CONFIG_INET #ifdef CONFIG_INET
......
...@@ -108,8 +108,8 @@ static int fddi_rebuild_header(struct sk_buff *skb) ...@@ -108,8 +108,8 @@ static int fddi_rebuild_header(struct sk_buff *skb)
else else
#endif #endif
{ {
printk("%s: Don't know how to resolve type %02X addresses.\n", printk("%s: Don't know how to resolve type %04X addresses.\n",
skb->dev->name, htons(fddi->hdr.llc_snap.ethertype)); skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype));
return(0); return(0);
} }
} }
......
...@@ -124,7 +124,7 @@ static int hippi_rebuild_header(struct sk_buff *skb) ...@@ -124,7 +124,7 @@ static int hippi_rebuild_header(struct sk_buff *skb)
* Determine the packet's protocol ID. * Determine the packet's protocol ID.
*/ */
unsigned short hippi_type_trans(struct sk_buff *skb, struct net_device *dev) __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct hippi_hdr *hip; struct hippi_hdr *hip;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册