From b56d0a5c4485f2ecc49405ef9ea87a8fcb6f1e6d Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Wed, 11 May 2011 07:18:41 +0000
Subject: [PATCH] --- yaml --- r: 255671 b: refs/heads/master c:
 91cd94bfe4f00fccf692e32dfa86a9fad0d61280 h: refs/heads/master i:   255669:
 53f0d107ba59c7fda1a7558c7709ba7f50e06949   255667:
 82bdf3d9fd66c4b18b83341678263d0b9cbb8e37   255663:
 fe5a0888091690cc4349d8572ee60a5b425867b1 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e2c09410109..5c40da44d10f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c04f6ca84866ef207e009a08e4c34ca241df7aa2
+refs/heads/master: 91cd94bfe4f00fccf692e32dfa86a9fad0d61280
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index a2d8ed506053..837324429f54 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -2336,6 +2336,24 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
 	return 0;
 }
 
+static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+			   void *rule_locs)
+{
+	struct ixgbe_adapter *adapter = netdev_priv(dev);
+	int ret = -EOPNOTSUPP;
+
+	switch (cmd->cmd) {
+	case ETHTOOL_GRXRINGS:
+		cmd->data = adapter->num_rx_queues;
+		ret = 0;
+		break;
+	default:
+		break;
+	}
+
+	return ret;
+}
+
 static const struct ethtool_ops ixgbe_ethtool_ops = {
 	.get_settings           = ixgbe_get_settings,
 	.set_settings           = ixgbe_set_settings,
@@ -2371,6 +2389,7 @@ static const struct ethtool_ops ixgbe_ethtool_ops = {
 	.set_coalesce           = ixgbe_set_coalesce,
 	.get_flags              = ethtool_op_get_flags,
 	.set_flags              = ixgbe_set_flags,
+	.get_rxnfc		= ixgbe_get_rxnfc,
 };
 
 void ixgbe_set_ethtool_ops(struct net_device *netdev)