Skip to content

Commit 8b9c23c

Browse files
Andre GuedesJeff Kirsher
authored andcommitted
igc: Cleanup _get|set_rxnfc ethtool ops
This patch does a trivial change in igc_ethtool_get_rxnfc() and igc_ethtool_set_rxnfc() to simplify their logic. Signed-off-by: Andre Guedes <[email protected]> Tested-by: Aaron Brown <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 4d0710c commit 8b9c23c

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

drivers/net/ethernet/intel/igc/igc_ethtool.c

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,31 +1055,23 @@ static int igc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
10551055
u32 *rule_locs)
10561056
{
10571057
struct igc_adapter *adapter = netdev_priv(dev);
1058-
int ret = -EOPNOTSUPP;
10591058

10601059
switch (cmd->cmd) {
10611060
case ETHTOOL_GRXRINGS:
10621061
cmd->data = adapter->num_rx_queues;
1063-
ret = 0;
1064-
break;
1062+
return 0;
10651063
case ETHTOOL_GRXCLSRLCNT:
10661064
cmd->rule_cnt = adapter->nfc_filter_count;
1067-
ret = 0;
1068-
break;
1065+
return 0;
10691066
case ETHTOOL_GRXCLSRULE:
1070-
ret = igc_get_ethtool_nfc_entry(adapter, cmd);
1071-
break;
1067+
return igc_get_ethtool_nfc_entry(adapter, cmd);
10721068
case ETHTOOL_GRXCLSRLALL:
1073-
ret = igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);
1074-
break;
1069+
return igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);
10751070
case ETHTOOL_GRXFH:
1076-
ret = igc_get_rss_hash_opts(adapter, cmd);
1077-
break;
1071+
return igc_get_rss_hash_opts(adapter, cmd);
10781072
default:
1079-
break;
1073+
return -EOPNOTSUPP;
10801074
}
1081-
1082-
return ret;
10831075
}
10841076

10851077
#define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \
@@ -1418,22 +1410,17 @@ static int igc_del_ethtool_nfc_entry(struct igc_adapter *adapter,
14181410
static int igc_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
14191411
{
14201412
struct igc_adapter *adapter = netdev_priv(dev);
1421-
int ret = -EOPNOTSUPP;
14221413

14231414
switch (cmd->cmd) {
14241415
case ETHTOOL_SRXFH:
1425-
ret = igc_set_rss_hash_opt(adapter, cmd);
1426-
break;
1416+
return igc_set_rss_hash_opt(adapter, cmd);
14271417
case ETHTOOL_SRXCLSRLINS:
1428-
ret = igc_add_ethtool_nfc_entry(adapter, cmd);
1429-
break;
1418+
return igc_add_ethtool_nfc_entry(adapter, cmd);
14301419
case ETHTOOL_SRXCLSRLDEL:
1431-
ret = igc_del_ethtool_nfc_entry(adapter, cmd);
1420+
return igc_del_ethtool_nfc_entry(adapter, cmd);
14321421
default:
1433-
break;
1422+
return -EOPNOTSUPP;
14341423
}
1435-
1436-
return ret;
14371424
}
14381425

14391426
void igc_write_rss_indir_tbl(struct igc_adapter *adapter)

0 commit comments

Comments
 (0)