net: make WARN_ON in dev_disable_lro() useful

osctobe · davem330 · commit 22d5969fb450 · 2011-04-25T11:56:27.000-07:00
Signed-off-by: Michał Mirosław &lt;mirq-linux@rere.qmqm.pl&gt;
Signed-off-by: Eric Dumazet &lt;eric.dumazet@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -1315,7 +1315,8 @@ void dev_disable_lro(struct net_device *dev)`
`1315`	`1315`	`return;`
`1316`	`1316`
`1317`	`1317`	`__ethtool_set_flags(dev, flags & ~ETH_FLAG_LRO);`
`1318`		`- WARN_ON(dev->features & NETIF_F_LRO);`
	`1318`	`+ if (unlikely(dev->features & NETIF_F_LRO))`
	`1319`	`+ netdev_WARN(dev, "failed to disable LRO!\n");`
`1319`	`1320`	`}`
`1320`	`1321`	`EXPORT_SYMBOL(dev_disable_lro);`
`1321`	`1322`