Commit 59c97d1b authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Tony Nguyen
Browse files

ice: simplify ice_run_xdp 



There's no need for 'result' variable, we can directly return the
internal status based on action returned by xdp prog.

Reviewed-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarKiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d06e2f05

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

+5 −10
Original line number Diff line number Diff line
@@ -537,22 +537,20 @@ static int 
ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,

	    struct bpf_prog *xdp_prog)

{

	int err, result = ICE_XDP_PASS;

	struct ice_ring *xdp_ring;

	int err;

	u32 act;



	act = bpf_prog_run_xdp(xdp_prog, xdp);

	switch (act) {

	case XDP_PASS:

		break;

		return ICE_XDP_PASS;

	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];

		result = ice_xmit_xdp_buff(xdp, xdp_ring);

		break;

		return ice_xmit_xdp_buff(xdp, xdp_ring);

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		break;

		return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;
@@ -560,11 +558,8 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, 
		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough;

	case XDP_DROP:

		result = ICE_XDP_CONSUMED;

		break;

		return ICE_XDP_CONSUMED;

	}



	return result;

}



/**