Commit f85b244e authored by Yajun Deng's avatar Yajun Deng Committed by David S. Miller
Browse files

xdp: move the if dev statements to the first 



The xdp_rxq_info_unreg() called by xdp_rxq_info_reg() is meaningless when
dev is NULL, so move the if dev statements to the first.

Signed-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23044d77

net/core/xdp.c

+5 −5
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ static void xdp_rxq_info_init(struct xdp_rxq_info *xdp_rxq) 
int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,

		     struct net_device *dev, u32 queue_index, unsigned int napi_id)

{

	if (!dev) {

		WARN(1, "Missing net_device from driver");

		return -ENODEV;

	}



	if (xdp_rxq->reg_state == REG_STATE_UNUSED) {

		WARN(1, "Driver promised not to register this");

		return -EINVAL;
@@ -169,11 +174,6 @@ int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq, 
		xdp_rxq_info_unreg(xdp_rxq);

	}



	if (!dev) {

		WARN(1, "Missing net_device from driver");

		return -ENODEV;

	}



	/* State either UNREGISTERED or NEW */

	xdp_rxq_info_init(xdp_rxq);

	xdp_rxq->dev = dev;