[net-next 05/15] i40e: Cleanup in FDIR SB ethtool code

STALE4592d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2014-03-26 18:04:22
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 192 in this series; 1 review trailer.

Revisions (192)

2011-01-28 v1
2011-01-28 v2 [diff vs current]
2011-02-08 v1
2011-02-08 v1
2011-02-11 v2 [diff vs current]
2011-02-24 v1
2011-03-03 v1
2011-03-08 v1
2011-03-11 v1
2011-03-12 v1
2011-09-16 v1
2011-09-17 v1
2011-09-17 v1
2011-09-23 v2 [diff vs current]
2011-09-30 v1
2011-10-05 v3 [diff vs current]
2011-10-06 v1
2011-10-07 v1
2011-10-08 v1
2011-10-11 v2 [diff vs current]
2011-10-13 v2 [diff vs current]
2011-10-14 v1
2011-10-16 v2 [diff vs current]
2011-10-17 v1
2011-10-17 v2 [diff vs current]
2011-10-18 v3 [diff vs current]
2011-10-21 v1
2011-11-16 v1
2011-12-03 v1
2011-12-05 v2 [diff vs current]
2011-12-23 v1
2012-01-03 v1
2012-01-03 v1
2012-01-05 v2 [diff vs current]
2012-01-19 v1
2012-01-26 v1
2012-01-27 v1
2012-02-07 v1
2012-02-08 v1
2012-02-09 v2 [diff vs current]
2012-02-11 v1
2012-02-13 v1
2012-02-24 v1
2012-02-25 v1
2012-03-01 v1
2012-03-03 v1
2012-03-13 v1
2012-03-14 v1
2012-03-17 v1
2012-03-19 v1
2012-04-03 v1
2012-04-14 v1
2012-04-27 v1
2012-05-01 v1
2012-05-02 v2 [diff vs current]
2012-05-04 v1
2012-05-10 v1
2012-06-09 v1
2012-06-14 v1
2012-06-20 v1
2012-07-11 v1
2012-07-14 v1
2012-07-17 v1
2012-07-18 v1
2012-07-18 v1
2012-07-20 v1
2012-07-20 v1
2012-07-21 v1
2012-08-21 v1
2012-08-23 v1
2012-08-31 v1
2012-09-05 v1
2012-09-17 v1
2012-09-17 v1
2012-09-22 v1
2012-09-24 v1
2012-10-03 v1
2012-10-19 v1
2012-10-20 v1
2012-10-23 v1
2012-10-23 v1
2012-10-26 v1
2012-10-27 v2 [diff vs current]
2012-10-30 v1
2012-11-01 v1
2012-11-13 v1
2012-11-15 v1
2012-11-21 v1
2012-11-22 v2 [diff vs current]
2012-11-28 v1
2012-12-01 v1
2012-12-07 v1
2013-01-11 v1
2013-01-16 v2 [diff vs current]
2013-01-17 v1
2013-01-18 v2 [diff vs current]
2013-01-19 v1
2013-01-23 v1
2013-01-28 v1
2013-02-08 v1
2013-03-08 v1
2013-03-26 v1
2013-03-28 v1
2013-04-04 v1
2013-04-12 v1
2013-04-18 v2 [diff vs current]
2013-04-18 v1
2013-04-20 v1
2013-04-25 v2 [diff vs current]
2013-04-26 v1
2013-05-21 v1
2013-06-14 v1
2013-06-26 v1
2013-07-28 v1
2013-07-29 v1
2013-07-31 v2 [diff vs current]
2013-08-21 v1
2013-08-22 v2 [diff vs current]
2013-08-23 v2 [diff vs current]
2013-08-28 v1
2013-08-29 v2 [diff vs current]
2013-08-30 v3 [diff vs current]
2013-09-04 v1
2013-09-04 v4 [diff vs current]
2013-09-06 v1
2013-09-06 v5 [diff vs current]
2013-09-06 v6 [diff vs current]
2013-09-11 v7 [diff vs current]
2013-09-13 v1
2013-09-24 v1
2013-09-27 v2 [diff vs current]
2013-10-01 v1
2013-10-10 v1
2013-10-18 v1
2013-10-22 v2 [diff vs current]
2013-10-24 v1
2013-10-29 v1
2013-11-01 v1
2013-11-28 v1
2013-11-30 v2 [diff vs current]
2013-12-06 v1
2013-12-07 v1
2013-12-10 v1
2013-12-12 v1
2013-12-16 v2 [diff vs current]
2013-12-18 v1
2013-12-18 v1
2013-12-19 v1
2013-12-20 v2 [diff vs current]
2013-12-20 v3 [diff vs current]
2013-12-28 v4 [diff vs current]
2014-01-01 v1
2014-01-02 v1
2014-01-03 v2 [diff vs current]
2014-01-04 v5 [diff vs current]
2014-01-05 v1
2014-01-06 v1
2014-01-07 v1
2014-01-08 v2 [diff vs current]
2014-01-09 v1
2014-01-10 v1
2014-01-10 v2 [diff vs current]
2014-01-11 v3 [diff vs current]
2014-03-06 v1
2014-03-07 v2 [diff vs current]
2014-03-08 v1
2014-03-12 v1
2014-03-13 v2 [diff vs current]
2014-03-14 v1
2014-03-14 v2 [diff vs current]
2014-03-17 v1
2014-03-19 v2 [diff vs current]
2014-03-20 v3 [diff vs current]
2014-03-20 v1
2014-03-21 v1
2014-03-26 v1 current
2014-03-28 v2 [diff vs current]
2014-03-31 v1
2014-04-11 v1
2014-04-19 v1
2014-04-22 v1
2014-04-23 v1
2014-04-24 v1
2014-04-25 v2 [diff vs current]
2014-04-28 v1
2014-05-14 v1
2014-05-21 v1
2014-05-23 v2 [diff vs current]
2014-05-27 v1
2014-05-29 v1
2014-06-03 v1
2014-06-04 v2 [diff vs current]

From: Anjali Singhai Jain <redacted>

Function add_del_fdir was used and implemented only for add. So change the name
and drop a parameter.

Change-ID: Icf2c6c3bbd4fd00cf8d9613a3f6d8c08e0f8e288
Signed-off-by: Anjali Singhai Jain <redacted>
Signed-off-by: Catherine Sullivan <redacted>
Tested-by: Kavindya Deegala <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++++---------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 28da412..0461a72 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c

@@ -62,8 +62,8 @@ static const struct i40e_stats i40e_gstrings_net_stats[] = {
 	I40E_NETDEV_STAT(rx_crc_errors),
 };
 
-static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
-				     struct ethtool_rxnfc *cmd, bool add);
+static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
+				 struct ethtool_rxnfc *cmd);
 
 /* These PF_STATs might look like duplicates of some NETDEV_STATs,
  * but they are separate.  This device supports Virtualization, and

@@ -1470,16 +1470,15 @@ static int i40e_del_fdir_entry(struct i40e_vsi *vsi,
 }
 
 /**
- * i40e_add_del_fdir_ethtool - Add/Remove Flow Director filters
+ * i40e_add_fdir_ethtool - Add/Remove Flow Director filters
  * @vsi: pointer to the targeted VSI
  * @cmd: command to get or set RX flow classification rules
- * @add: true adds a filter, false removes it
  *
- * Add/Remove Flow Director filters for a specific flow spec based on their
- * protocol.  Returns 0 if the filters were successfully added or removed.
+ * Add Flow Director filters for a specific flow spec based on their
+ * protocol.  Returns 0 if the filters were successfully added.
  **/
-static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
-				     struct ethtool_rxnfc *cmd, bool add)
+static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
+				 struct ethtool_rxnfc *cmd)
 {
 	struct ethtool_rx_flow_spec *fsp;
 	struct i40e_fdir_filter *input;

@@ -1494,7 +1493,7 @@ static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
 	if (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))
 		return -EOPNOTSUPP;
 
-	if (add && (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED))
+	if (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)
 		return -ENOSPC;
 
 	fsp = (struct ethtool_rx_flow_spec *)&cmd->fs;

@@ -1504,7 +1503,7 @@ static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
 		return -EINVAL;
 	}
 
-	if ((fsp->ring_cookie >= vsi->num_queue_pairs) && add)
+	if (fsp->ring_cookie >= vsi->num_queue_pairs)
 		return -EINVAL;
 
 	input = kzalloc(sizeof(*input), GFP_KERNEL);

@@ -1528,16 +1527,11 @@ static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
 	input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
 	input->dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
 
-	ret = i40e_add_del_fdir(vsi, input, add);
-	if (ret) {
+	ret = i40e_add_del_fdir(vsi, input, true);
+	if (ret)
 		kfree(input);
-		return ret;
-	}
-
-	if (!ret && add)
-		i40e_update_ethtool_fdir_entry(vsi, input, fsp->location, NULL);
 	else
-		kfree(input);
+		i40e_update_ethtool_fdir_entry(vsi, input, fsp->location, NULL);
 
 	return ret;
 }

@@ -1561,7 +1555,7 @@ static int i40e_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)
 		ret = i40e_set_rss_hash_opt(pf, cmd);
 		break;
 	case ETHTOOL_SRXCLSRLINS:
-		ret = i40e_add_del_fdir_ethtool(vsi, cmd, true);
+		ret = i40e_add_fdir_ethtool(vsi, cmd);
 		break;
 	case ETHTOOL_SRXCLSRLDEL:
 		ret = i40e_del_fdir_entry(vsi, cmd);

-- 
1.8.3.1

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help