X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=net%2Fwanrouter%2Fwanmain.c;h=13b650ad22e21a6a6bec891d5bfe8ce4efb52236;hb=ab611487d8ada506e511d2b8f22fb8e7be9939b9;hp=d6844ac226f5e17cead226a4e083ae0d7d81b5ea;hpb=84531c24f27b02daa8e54e2bb6dc74a730fdf0a5;p=mirror_ubuntu-bionic-kernel.git diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index d6844ac226f5..13b650ad22e2 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c @@ -358,10 +358,10 @@ int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, */ -unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) +__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) { int cnt = skb->data[0] ? 0 : 1; /* there may be a pad present */ - unsigned short ethertype; + __be16 ethertype; switch (skb->data[cnt]) { case NLPID_IP: /* IP datagramm */ @@ -379,7 +379,7 @@ unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) skb->data[cnt+3], dev->name); return 0; } - ethertype = *((unsigned short*)&skb->data[cnt+4]); + ethertype = *((__be16*)&skb->data[cnt+4]); cnt += 6; break;