| @@ -2126,7 +2126,7 @@ int ice_vsi_cfg_xdp_txqs(struct ice_vsi *vsi) · 2125 unmodified lines |
| 2126 | ice_for_each_rxq(vsi, i) | 2126 | ice_for_each_rxq(vsi, i) |
| 2127 | ice_tx_xsk_pool(vsi, i); | 2127 | ice_tx_xsk_pool(vsi, i); |
| 2128 | | 2128 | |
| 2129 | return ret; | 2129 | return 0; |
| 2130 | } | 2130 | } |
| 2131 | | 2131 | |
| 2132 | /** | 2132 | /** |
| @@ -2693,12 +2693,14 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params) · 560 unmodified lines |
| 2693 | return ret; | 2693 | return ret; |
| 2694 | | 2694 | |
| 2695 | /* allocate memory for Tx/Rx ring stat pointers */ | 2695 | /* allocate memory for Tx/Rx ring stat pointers */ |
| 2696 | if (ice_vsi_alloc_stat_arrays(vsi)) | 2696 | ret = ice_vsi_alloc_stat_arrays(vsi); |
| | 2697 | if (ret) |
| 2697 | goto unroll_vsi_alloc; | 2698 | goto unroll_vsi_alloc; |
| 2698 | | 2699 | |
| 2699 | ice_alloc_fd_res(vsi); | 2700 | ice_alloc_fd_res(vsi); |
| 2700 | | 2701 | |
| 2701 | if (ice_vsi_get_qs(vsi)) { | 2702 | ret = ice_vsi_get_qs(vsi); |
| | 2703 | if (ret) { |
| 2702 | dev_err(dev, "Failed to allocate queues. vsi->idx = %d\n", | 2704 | dev_err(dev, "Failed to allocate queues. vsi->idx = %d\n", |
| 2703 | vsi->idx); | 2705 | vsi->idx); |
| 2704 | goto unroll_vsi_alloc_stat; | 2706 | goto unroll_vsi_alloc_stat; |
| @@ -2811,6 +2813,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params) · 106 unmodified lines |
| 2811 | break; | 2813 | break; |
| 2812 | default: | 2814 | default: |
| 2813 | /* clean up the resources and exit */ | 2815 | /* clean up the resources and exit */ |
| | 2816 | ret = -EINVAL; |
| 2814 | goto unroll_vsi_init; | 2817 | goto unroll_vsi_init; |
| 2815 | } | 2818 | } |
| 2816 | | 2819 | |
| @@ -3508,10 +3511,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags) · 691 unmodified lines |
| 3508 | if (vsi_flags & ICE_VSI_FLAG_INIT) { | 3511 | if (vsi_flags & ICE_VSI_FLAG_INIT) { |
| 3509 | ret = -EIO; | 3512 | ret = -EIO; |
| 3510 | goto err_vsi_cfg_tc_lan; | 3513 | goto err_vsi_cfg_tc_lan; |
| 3511 | } else { | | |
| 3512 | kfree(coalesce); | | |
| 3513 | return ice_schedule_reset(pf, ICE_RESET_PFR); | | |
| 3514 | } | 3514 | } |
| | 3515 | |
| | 3516 | kfree(coalesce); |
| | 3517 | return ice_schedule_reset(pf, ICE_RESET_PFR); |
| 3515 | } | 3518 | } |
| 3516 | | 3519 | |
| 3517 | ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq); | 3520 | ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq); |
| @@ -3759,7 +3762,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc) · 241 unmodified lines |
| 3759 | dev = ice_pf_to_dev(pf); | 3762 | dev = ice_pf_to_dev(pf); |
| 3760 | if (vsi->tc_cfg.ena_tc == ena_tc && | 3763 | if (vsi->tc_cfg.ena_tc == ena_tc && |
| 3761 | vsi->mqprio_qopt.mode != TC_MQPRIO_MODE_CHANNEL) | 3764 | vsi->mqprio_qopt.mode != TC_MQPRIO_MODE_CHANNEL) |
| 3762 | return ret; | 3765 | return 0; |
| 3763 | | 3766 | |
| 3764 | ice_for_each_traffic_class(i) { | 3767 | ice_for_each_traffic_class(i) { |
| 3765 | /* build bitmap of enabled TCs */ | 3768 | /* build bitmap of enabled TCs */ |