From 9cce314a99197102b7788437964397c0ca07033d Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 31 Mar 2009 15:06:26 -0700
Subject: [PATCH] --- yaml --- r: 139780 b: refs/heads/master c:
 c9caceca25854eff4328c89045793a91bf8f9ee3 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/ethtool.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccd590b6bfd3..21478e3d6162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb1fee86fdc7df1fd145fd3bfb16635274b7c73d
+refs/heads/master: c9caceca25854eff4328c89045793a91bf8f9ee3
diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c
index 244ca56dffac..d9d5160610d5 100644
--- a/trunk/net/core/ethtool.c
+++ b/trunk/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;
 }