summaryrefslogtreecommitdiffstats
path: root/drivers/net/via-rhine.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2011-03-28 17:08:59 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-30 21:39:23 -0700
commit4562b2fe1ebc7c547746660f735ff9af964f28ad (patch)
tree1f1ab3095fb680efd5bad38fb9c726ccfe720c2e /drivers/net/via-rhine.c
parent19eccc2bc6ad3b1c81d0826a77955500be972504 (diff)
downloadlinux-stable-4562b2fe1ebc7c547746660f735ff9af964f28ad.tar.gz
linux-stable-4562b2fe1ebc7c547746660f735ff9af964f28ad.tar.bz2
linux-stable-4562b2fe1ebc7c547746660f735ff9af964f28ad.zip
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>
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r--drivers/net/via-rhine.c2
1 files changed, 1 insertions, 1 deletions
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 */