net: Use device model to get driver name in skb_gso_segment()

ethtool operations generally require the caller to hold RTNL and are
not safe to call in atomic context.  The device model provides this
information for most devices; we'll only lose it for some old ISA
drivers.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev.c b/net/core/dev.c
index f494675471a91b7f093665e6098ee7b3a91e6e4e..7e6b7dcaacdec56a9a6bb3e1d8ee27e56ec928b6 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1962,13 +1962,13 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb,
 
        if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
                struct net_device *dev = skb->dev;
-               struct ethtool_drvinfo info = {};
+               const char *driver = "";
 
-               if (dev && dev->ethtool_ops && dev->ethtool_ops->get_drvinfo)
-                       dev->ethtool_ops->get_drvinfo(dev, &info);
+               if (dev && dev->dev.parent)
+                       driver = dev_driver_string(dev->dev.parent);
 
                WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d ip_summed=%d\n",
-                    info.driver, dev ? &dev->features : NULL,
+                    driver, dev ? &dev->features : NULL,
                     skb->sk ? &skb->sk->sk_route_caps : NULL,
                     skb->len, skb->data_len, skb->ip_summed);