Message ID | 20211217092545.30204-1-yajun.deng@linux.dev (mailing list archive) |
---|---|
State | Accepted |
Commit | f85b244ee395c774a0039c176f46fc0d3747a0ae |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] xdp: move the if dev statements to the first | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 17 Dec 2021 17:25:45 +0800 you wrote: > 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: Yajun Deng <yajun.deng@linux.dev> > --- > net/core/xdp.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Here is the summary with links: - [net-next] xdp: move the if dev statements to the first https://git.kernel.org/netdev/net-next/c/f85b244ee395 You are awesome, thank you!
diff --git a/net/core/xdp.c b/net/core/xdp.c index 5ddc29f29bad..7fe1df85f505 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -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;
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: Yajun Deng <yajun.deng@linux.dev> --- net/core/xdp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)