Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 244ca56dffac3eb57536142f5aa36e2f4a6f12a5..d9d5160610d5e87741965bcddc126f46a4f5c0cd 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -261,8 +261,7 @@ static int ethtool_get_rxnfc(struct net_device *dev, void __user *useraddr)
        ret = 0;
 
 err_out:
-       if (rule_buf)
-               kfree(rule_buf);
+       kfree(rule_buf);
 
        return ret;
 }