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>

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 5005a36f85938dd8303b387f3e9e788b7d3ec7b8..6cf1c71ed7f166df780c54d95ab58bd415d4b33d 100644 (file)
--- 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)
                return IXGBE_TEST_LEN;
        case ETH_SS_STATS:
                return IXGBE_STATS_LEN;
-       case ETH_SS_NTUPLE_FILTERS:
-               return ETHTOOL_MAX_NTUPLE_LIST_ENTRY *
-                      ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY;
        default:
                return -EOPNOTSUPP;
        }

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 200ae7e60ba0d2176e45500463aa348a699b2f48..dbe29e57280fb504eb4ca5784a6de28a5d75213c 100644 (file)
--- 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)
                break;
        }
 
-       /* clear n-tuple filters that are cached */
-       ethtool_ntuple_flush(netdev);
-
        if (!pci_channel_offline(adapter->pdev))
                ixgbe_reset(adapter);