Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e52ac339 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <bhutchings@solarflare.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27a42938

net/core/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -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);