Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TR]: endiannness annotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-09-26 21:23:16 -07:00 committed by David S. Miller
parent 2a50f28c32
commit 0ac0760a57
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/trdevice.h
View File

@ -28,7 +28,7 @@
#include <linux/if_tr.h> #include <linux/if_tr.h>
#ifdef __KERNEL__ #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 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); extern struct net_device *alloc_trdev(int sizeof_priv);

12
net/802/tr.c
View File

@ -164,7 +164,7 @@ static int tr_rebuild_header(struct sk_buff *skb)
*/ */
if(trllc->ethertype != htons(ETH_P_IP)) { 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; return 0;
} }
@ -186,7 +186,7 @@ static int tr_rebuild_header(struct sk_buff *skb)
* it via SNAP. * 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; 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 && if (trllc->dsap == EXTENDED_SAP &&
(trllc->ethertype == ntohs(ETH_P_IP) || (trllc->ethertype == htons(ETH_P_IP) ||
trllc->ethertype == ntohs(ETH_P_IPV6) || trllc->ethertype == htons(ETH_P_IPV6) ||
trllc->ethertype == ntohs(ETH_P_ARP))) trllc->ethertype == htons(ETH_P_ARP)))
{ {
skb_pull(skb, sizeof(struct trllc)); skb_pull(skb, sizeof(struct trllc));
return trllc->ethertype; return trllc->ethertype;
} }
return ntohs(ETH_P_TR_802_2); return htons(ETH_P_TR_802_2);
} }
/* /*