summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorMichał Mirosław2011-04-21 14:42:15 +0200
committerDavid S. Miller2011-04-25 20:56:27 +0200
commit22d5969fb450afd3a4aff606360f7d52c5a3a628 (patch)
tree77c294b770eb91d4a439231186e561c1e82c827d /net/core
parentnet: Remove __KERNEL__ cpp checks from include/net (diff)
downloadkernel-qcow2-linux-22d5969fb450afd3a4aff606360f7d52c5a3a628.tar.gz
kernel-qcow2-linux-22d5969fb450afd3a4aff606360f7d52c5a3a628.tar.xz
kernel-qcow2-linux-22d5969fb450afd3a4aff606360f7d52c5a3a628.zip
net: make WARN_ON in dev_disable_lro() useful
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 379c993ff421..541f22a035a2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1315,7 +1315,8 @@ void dev_disable_lro(struct net_device *dev)
return;
__ethtool_set_flags(dev, flags & ~ETH_FLAG_LRO);
- WARN_ON(dev->features & NETIF_F_LRO);
+ if (unlikely(dev->features & NETIF_F_LRO))
+ netdev_WARN(dev, "failed to disable LRO!\n");
}
EXPORT_SYMBOL(dev_disable_lro);