From: Joe Jin <joe.jin@oracle.com>
Date: Fri, 18 May 2012 03:56:48 +0000 (+0800)
Subject: e1000e: fix build warning.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9a99587c0fa868306dbd51936602ee290bd1e315;p=users%2Fjedix%2Flinux-maple.git

e1000e: fix build warning.

The waring introduced by commit ffd3d6, for different declare
of get_rxnfc().

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 5ad08c70be9c..296416d0b556 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1977,7 +1977,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
 }
 
 static int e1000_get_rxnfc(struct net_device *netdev,
-			   struct ethtool_rxnfc *info, u32 *rule_locs)
+			   struct ethtool_rxnfc *info, void *rule_locs)
 {
 	info->data = 0;