ethtool: Remove unimplemented flow specification types

struct ethtool_rawip4_spec and struct ethtool_ether_spec are neither
commented nor used by any driver, so remove them.  Adjust padding in
the user-visible unions that included these structures.

Fix references to struct ethtool_rawip4_spec in
ethtool_get_rx_ntuple(), which should use struct ethtool_usrip4_spec.

struct ethtool_usrip4_spec cannot hold IPv6 host addresses and there
is no separate structure that can, so remove ETH_RX_NFC_IP6 and the
reference to it in niu.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 14 deletions

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 8e1859c801a4..e36a83845a1c 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -7462,10 +7462,12 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
         if (fsp->flow_type == IP_USER_FLOW) {
                 int i;
                 int add_usr_cls = 0;
-                int ipv6 = 0;
                 struct ethtool_usrip4_spec *uspec = &fsp->h_u.usr_ip4_spec;
                 struct ethtool_usrip4_spec *umask = &fsp->m_u.usr_ip4_spec;
 
+                if (uspec->ip_ver != ETH_RX_NFC_IP4)
+                        return -EINVAL;
+
                 niu_lock_parent(np, flags);
 
                 for (i = 0; i < NIU_L3_PROG_CLS; i++) {
@@ -7494,9 +7496,7 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
                                 default:
                                         break;
                                 }
-                                if (uspec->ip_ver == ETH_RX_NFC_IP6)
-                                        ipv6 = 1;
-                                ret = tcam_user_ip_class_set(np, class, ipv6,
+                                ret = tcam_user_ip_class_set(np, class, 0,
                                                              uspec->proto,
                                                              uspec->tos,
                                                              umask->tos);
@@ -7553,16 +7553,7 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
                 ret = -EINVAL;
                 goto out;
         case IP_USER_FLOW:
-                if (fsp->h_u.usr_ip4_spec.ip_ver == ETH_RX_NFC_IP4) {
-                        niu_get_tcamkey_from_ip4fs(fsp, tp, l2_rdc_table,
-                                                   class);
-                } else {
-                        /* Not yet implemented */
-                        netdev_info(np->dev, "niu%d: In %s(): usr flow for IPv6 not implemented\n",
-                                    parent->index, __func__);
-                        ret = -EINVAL;
-                        goto out;
-                }
+                niu_get_tcamkey_from_ip4fs(fsp, tp, l2_rdc_table, class);
                 break;
         default:
                 netdev_info(np->dev, "niu%d: In %s(): Unknown flow type %d\n",