[Intel-wired-lan] [PATCH net-next 13/15] iavf: Set RSS LUT and key in reset handle path

[Jankowski, Konrad0]

> From: Md Fahad Iqbal Polash <md.fahad.iqbal.polash at intel.com>
> 
> iavf driver should set RSS LUT and key unconditionally in reset path.
> Currently, the driver does not do that. This patch fixes this issue.
> 
> Signed-off-by: Md Fahad Iqbal Polash <md.fahad.iqbal.polash at intel.com>
> Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
> ---
>  drivers/net/ethernet/intel/iavf/iavf_main.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c
> b/drivers/net/ethernet/intel/iavf/iavf_main.c
> index e7b9c64db3b5..892aa22b39da 100644
> --- a/drivers/net/ethernet/intel/iavf/iavf_main.c
> +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
> @@ -1534,11 +1534,6 @@ static int iavf_reinit_interrupt_scheme(struct
> iavf_adapter *adapter)
>  	set_bit(__IAVF_VSI_DOWN, adapter->vsi.state);
> 
>  	iavf_map_rings_to_vectors(adapter);
> -
> -	if (RSS_AQ(adapter))
> -		adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_RSS;
> -	else
> -		err = iavf_init_rss(adapter);
>  err:
>  	return err;
>  }
> @@ -2233,6 +2228,14 @@ static void iavf_reset_task(struct work_struct
> *work)
>  			goto reset_err;
>  	}
> 
> +	if (RSS_AQ(adapter)) {
> +		adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_RSS;
> +	} else {
> +		err = iavf_init_rss(adapter);
> +		if (err)
> +			goto reset_err;
> +	}
> +
>  	adapter->aq_required |= IAVF_FLAG_AQ_GET_CONFIG;
>  	adapter->aq_required |= IAVF_FLAG_AQ_MAP_VECTORS;
> 
> --
> 2.20.1

Tested-by: Konrad Jankowski <konrad0.jankowski at intel.com>