1 files changed, 20 insertions, 10 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 7243421c9783..416137c64bf8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4767,6 +4767,13 @@ struct packet_offload *gro_find_complete_by_type(__be16 type)
 }
 EXPORT_SYMBOL(gro_find_complete_by_type);
 
+static void napi_skb_free_stolen_head(struct sk_buff *skb)
+{
+        skb_dst_drop(skb);
+        secpath_reset(skb);
+        kmem_cache_free(skbuff_head_cache, skb);
+}
+
 static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
 {
         switch (ret) {
@@ -4780,13 +4787,10 @@ static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
                 break;
 
         case GRO_MERGED_FREE:
-                if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) {
-                        skb_dst_drop(skb);
-                        secpath_reset(skb);
-                        kmem_cache_free(skbuff_head_cache, skb);
-                } else {
+                if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
+                        napi_skb_free_stolen_head(skb);
+                else
                         __kfree_skb(skb);
-                }
                 break;
 
         case GRO_HELD:
@@ -4858,10 +4862,16 @@ static gro_result_t napi_frags_finish(struct napi_struct *napi,
                 break;
 
         case GRO_DROP:
-        case GRO_MERGED_FREE:
                 napi_reuse_skb(napi, skb);
                 break;
 
+        case GRO_MERGED_FREE:
+                if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
+                        napi_skb_free_stolen_head(skb);
+                else
+                        napi_reuse_skb(napi, skb);
+                break;
+
         case GRO_MERGED:
         case GRO_CONSUMED:
                 break;
@@ -7783,9 +7793,9 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
         } else {
                 netdev_stats_to_stats64(storage, &dev->stats);
         }
-        storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
-        storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
-        storage->rx_nohandler += atomic_long_read(&dev->rx_nohandler);
+        storage->rx_dropped += (unsigned long)atomic_long_read(&dev->rx_dropped);
+        storage->tx_dropped += (unsigned long)atomic_long_read(&dev->tx_dropped);
+        storage->rx_nohandler += (unsigned long)atomic_long_read(&dev->rx_nohandler);
         return storage;
 }
 EXPORT_SYMBOL(dev_get_stats);