Apply k4412 kernel from HardKernel for ODROID-X.

1 files changed, 6 insertions, 5 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index ff3ed6086ce..dac6a214746 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -38,16 +38,17 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 #endif
 
-        u64_stats_update_begin(&brstats->syncp);
-        brstats->tx_packets++;
-        brstats->tx_bytes += skb->len;
-        u64_stats_update_end(&brstats->syncp);
-
         BR_INPUT_SKB_CB(skb)->brdev = dev;
 
         skb_reset_mac_header(skb);
         skb_pull(skb, ETH_HLEN);
 
+        u64_stats_update_begin(&brstats->syncp);
+        brstats->tx_packets++;
+        /* Exclude ETH_HLEN from byte stats for consistency with Rx chain */
+        brstats->tx_bytes += skb->len;
+        u64_stats_update_end(&brstats->syncp);
+
         rcu_read_lock();
         if (is_broadcast_ether_addr(dest))
                 br_flood_deliver(br, skb);