Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac0760a authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[TR]: endiannness annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a50f28c

include/linux/trdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/802/tr.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

}



/*