Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / net / via-rhine.c

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index eb5d75df5d5d8f1e8b25a4772a0231b4f0d809a6..0422a79acfd7d8754ab6e33926b103dc3f537bc2 100644 (file)
--- 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 */