From 5fd30e0e624f1db94e8dbd5ee41a68223cfa01e9 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 16 Jan 2012 12:38:59 +0000 Subject: [PATCH] --- yaml --- r: 286181 b: refs/heads/master c: e52ac3398c3d772d372b9b62ab408fd5eec96840 h: refs/heads/master i: 286179: 412e78bd41ca469bd448712a85d3de621003e8e6 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 66b05eb7446f..c0e60a53e0fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27a429383b399fc0f68bea55c422d7179f3c8b05 +refs/heads/master: e52ac3398c3d772d372b9b62ab408fd5eec96840 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f494675471a9..7e6b7dcaacde 100644 --- a/trunk/net/core/dev.c +++ b/trunk/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);