Commit 4fe36226 authored by Paul M Stillwell Jr's avatar Paul M Stillwell Jr Committed by Tony Nguyen
Browse files

ice: remove return variable 



We were saving the return value from ice_vsi_manage_rss_lut(), but
the errors from that function are not critical so change it to
return void and remove the code that saved the value.

Signed-off-by: default avatarPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent b370245b

drivers/net/ethernet/intel/ice/ice_lib.c

+3 −5
Original line number Diff line number Diff line
@@ -1313,14 +1313,13 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi) 
 * LUT, while in the event of enable request for RSS, it will reconfigure RSS

 * LUT.

 */

int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena)

void ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena)

{

	int err = 0;

	u8 *lut;



	lut = kzalloc(vsi->rss_table_size, GFP_KERNEL);

	if (!lut)

		return -ENOMEM;

		return;



	if (ena) {

		if (vsi->rss_lut_user)
@@ -1330,9 +1329,8 @@ int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena) 
					 vsi->rss_size);

	}



	err = ice_set_rss_lut(vsi, lut, vsi->rss_table_size);

	ice_set_rss_lut(vsi, lut, vsi->rss_table_size);

	kfree(lut);

	return err;

}



/**

drivers/net/ethernet/intel/ice/ice_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void ice_vsi_free_rx_rings(struct ice_vsi *vsi); 


void ice_vsi_free_tx_rings(struct ice_vsi *vsi);



int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);

void ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);



void ice_update_tx_ring_stats(struct ice_ring *ring, u64 pkts, u64 bytes);

drivers/net/ethernet/intel/ice/ice_main.c

+2 −2
Original line number Diff line number Diff line
@@ -5112,10 +5112,10 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) 
	 * separate if/else statements to guarantee each feature is checked

	 */

	if (features & NETIF_F_RXHASH && !(netdev->features & NETIF_F_RXHASH))

		ret = ice_vsi_manage_rss_lut(vsi, true);

		ice_vsi_manage_rss_lut(vsi, true);

	else if (!(features & NETIF_F_RXHASH) &&

		 netdev->features & NETIF_F_RXHASH)

		ret = ice_vsi_manage_rss_lut(vsi, false);

		ice_vsi_manage_rss_lut(vsi, false);



	if ((features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_RX))