Merge tag 'v4.11-rc1' into omap-for-v4.11/fixes

[linux-2.6-microblaze.git] / net / ethernet / eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 516c87e..1446810 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -393,6 +393,34 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
 }
 EXPORT_SYMBOL(alloc_etherdev_mqs);
 
+static void devm_free_netdev(struct device *dev, void *res)
+{
+       free_netdev(*(struct net_device **)res);
+}
+
+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
+                                          unsigned int txqs, unsigned int rxqs)
+{
+       struct net_device **dr;
+       struct net_device *netdev;
+
+       dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);
+       if (!dr)
+               return NULL;
+
+       netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);
+       if (!netdev) {
+               devres_free(dr);
+               return NULL;
+       }
+
+       *dr = netdev;
+       devres_add(dev, dr);
+
+       return netdev;
+}
+EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
+
 ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
 {
        return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);
@@ -447,7 +475,7 @@ struct sk_buff **eth_gro_receive(struct sk_buff **head,
 out_unlock:
        rcu_read_unlock();
 out:
-       NAPI_GRO_CB(skb)->flush |= flush;
+       skb_gro_flush_final(skb, pp, flush);
 
        return pp;
 }