Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index d1e8116e93cd374d87a04307de65e64799fcf1c8..862eaa744a54791d08119107db2046107abaefb2 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6575,6 +6575,14 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
 
 static const struct ethtool_ops default_ethtool_ops;
 
+void netdev_set_default_ethtool_ops(struct net_device *dev,
+                                   const struct ethtool_ops *ops)
+{
+       if (dev->ethtool_ops == &default_ethtool_ops)
+               dev->ethtool_ops = ops;
+}
+EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);
+
 /**
  *     alloc_netdev_mqs - allocate network device
  *     @sizeof_priv:   size of private data to allocate space for