3 files changed, 6 insertions, 9 deletions

diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index b26ce343072c..8d9503ad01da 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -25,7 +25,6 @@ struct vlan_priority_tci_mapping {
  *      @rx_multicast: number of received multicast packets
  *      @syncp: synchronization point for 64bit counters
  *      @rx_errors: number of errors
- *      @rx_dropped: number of dropped packets
  */
 struct vlan_rx_stats {
         u64                     rx_packets;
@@ -33,7 +32,6 @@ struct vlan_rx_stats {
         u64                     rx_multicast;
         struct u64_stats_sync   syncp;
         unsigned long           rx_errors;
-        unsigned long           rx_dropped;
 };
 
 /**
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index b6d55a9304f2..dee727ce0291 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -33,6 +33,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
         return polling ? netif_receive_skb(skb) : netif_rx(skb);
 
 drop:
+        atomic_long_inc(&skb->dev->rx_dropped);
         dev_kfree_skb_any(skb);
         return NET_RX_DROP;
 }
@@ -123,6 +124,7 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
         return dev_gro_receive(napi, skb);
 
 drop:
+        atomic_long_inc(&skb->dev->rx_dropped);
         return GRO_DROP;
 }
 
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index f6fbcc0f1af9..f54251edd40d 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -225,16 +225,15 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                 }
         }
 
-        if (unlikely(netif_rx(skb) == NET_RX_DROP)) {
-                if (rx_stats)
-                        rx_stats->rx_dropped++;
-        }
+        netif_rx(skb);
+
         rcu_read_unlock();
         return NET_RX_SUCCESS;
 
 err_unlock:
         rcu_read_unlock();
 err_free:
+        atomic_long_inc(&dev->rx_dropped);
         kfree_skb(skb);
         return NET_RX_DROP;
 }
@@ -846,15 +845,13 @@ static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, st
                         accum.rx_packets += rxpackets;
                         accum.rx_bytes   += rxbytes;
                         accum.rx_multicast += rxmulticast;
-                        /* rx_errors, rx_dropped are ulong, not protected by syncp */
+                        /* rx_errors is ulong, not protected by syncp */
                         accum.rx_errors  += p->rx_errors;
-                        accum.rx_dropped += p->rx_dropped;
                 }
                 stats->rx_packets = accum.rx_packets;
                 stats->rx_bytes   = accum.rx_bytes;
                 stats->rx_errors  = accum.rx_errors;
                 stats->multicast  = accum.rx_multicast;
-                stats->rx_dropped = accum.rx_dropped;
         }
         return stats;
 }