aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2011-04-09 01:34:06 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-04-27 05:13:02 -0400
commit11b1d38e705fa05282661d2b1710f7a81a7f7045 (patch)
tree131da0e215486ed695971540faab9df637953637 /drivers
parent98508c93003d8d24662f32c66dbe4746340c33d4 (diff)
ixgbe: remove ntuple display support
This change removes the ntuple display support from ixgbe. The reason for this change is to resolve a number of issues in the way display filtering is handled. I plan to add support for displaying these filters via the network flow classifier interface. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Evan Swanson <evan.swanson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c3
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 5005a36f8593..6cf1c71ed7f1 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1030,9 +1030,6 @@ static int ixgbe_get_sset_count(struct net_device *netdev, int sset)
1030 return IXGBE_TEST_LEN; 1030 return IXGBE_TEST_LEN;
1031 case ETH_SS_STATS: 1031 case ETH_SS_STATS:
1032 return IXGBE_STATS_LEN; 1032 return IXGBE_STATS_LEN;
1033 case ETH_SS_NTUPLE_FILTERS:
1034 return ETHTOOL_MAX_NTUPLE_LIST_ENTRY *
1035 ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY;
1036 default: 1033 default:
1037 return -EOPNOTSUPP; 1034 return -EOPNOTSUPP;
1038 } 1035 }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 200ae7e60ba0..dbe29e57280f 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4203,9 +4203,6 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
4203 break; 4203 break;
4204 } 4204 }
4205 4205
4206 /* clear n-tuple filters that are cached */
4207 ethtool_ntuple_flush(netdev);
4208
4209 if (!pci_channel_offline(adapter->pdev)) 4206 if (!pci_channel_offline(adapter->pdev))
4210 ixgbe_reset(adapter); 4207 ixgbe_reset(adapter);
4211 4208