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

[firefly-linux-kernel-4.4.55.git] / drivers / net / via-rhine.c

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 5e7f069eab533e75cf950294648a7967da104bb0..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 */
@@ -1861,7 +1861,7 @@ static void rhine_restart_tx(struct net_device *dev) {
        u32 intr_status;
 
        /*
-        * If new errors occured, we need to sort them out before doing Tx.
+        * If new errors occurred, we need to sort them out before doing Tx.
         * In that case the ISR will be back here RSN anyway.
         */
        intr_status = get_intr_status(dev);
@@ -1887,7 +1887,7 @@ static void rhine_restart_tx(struct net_device *dev) {
                /* This should never happen */
                if (debug > 1)
                        printk(KERN_WARNING "%s: rhine_restart_tx() "
-                              "Another error occured %8.8x.\n",
+                              "Another error occurred %8.8x.\n",
                               dev->name, intr_status);
        }