From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Mon, 28 Mar 2011 17:08:59 +0000 (+0000)
Subject: via-rhine: trivial sparse annotation in vlan_tci helper
X-Git-Tag: v3.0-rc1~377^2~565
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4562b2fe1ebc7c547746660f735ff9af964f28ad;p=karo-tx-linux.git

via-rhine: trivial sparse annotation in vlan_tci helper

Noticed by sparse:
drivers/net/via-rhine.c:1706:16: warning: cast to restricted __be16

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 5e7f069eab53..707f7f8beb6f 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1703,7 +1703,7 @@ static void rhine_tx(struct net_device *dev)
 static inline u16 rhine_get_vlan_tci(struct sk_buff *skb, int data_size)
 {
 	u8 *trailer = (u8 *)skb->data + ((data_size + 3) & ~3) + 2;
-	return ntohs(*(u16 *)trailer);
+	return be16_to_cpup((__be16 *)trailer);
 }
 
 /* Process up to limit frames from receive ring */