mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-12 10:55:08 +00:00
[TR]: endiannness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2a50f28c32
commit
0ac0760a57
@ -28,7 +28,7 @@
|
||||
#include <linux/if_tr.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
extern unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev);
|
||||
extern __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev);
|
||||
extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
|
||||
extern struct net_device *alloc_trdev(int sizeof_priv);
|
||||
|
||||
|
12
net/802/tr.c
12
net/802/tr.c
@ -164,7 +164,7 @@ static int tr_rebuild_header(struct sk_buff *skb)
|
||||
*/
|
||||
|
||||
if(trllc->ethertype != htons(ETH_P_IP)) {
|
||||
printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(trllc->ethertype));
|
||||
printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(trllc->ethertype));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -186,7 +186,7 @@ static int tr_rebuild_header(struct sk_buff *skb)
|
||||
* it via SNAP.
|
||||
*/
|
||||
|
||||
unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev)
|
||||
__be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
|
||||
struct trh_hdr *trh=(struct trh_hdr *)skb->data;
|
||||
@ -229,15 +229,15 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev)
|
||||
*/
|
||||
|
||||
if (trllc->dsap == EXTENDED_SAP &&
|
||||
(trllc->ethertype == ntohs(ETH_P_IP) ||
|
||||
trllc->ethertype == ntohs(ETH_P_IPV6) ||
|
||||
trllc->ethertype == ntohs(ETH_P_ARP)))
|
||||
(trllc->ethertype == htons(ETH_P_IP) ||
|
||||
trllc->ethertype == htons(ETH_P_IPV6) ||
|
||||
trllc->ethertype == htons(ETH_P_ARP)))
|
||||
{
|
||||
skb_pull(skb, sizeof(struct trllc));
|
||||
return trllc->ethertype;
|
||||
}
|
||||
|
||||
return ntohs(ETH_P_TR_802_2);
|
||||
return htons(ETH_P_TR_802_2);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user