[PATCH net-next 1/3] net: use netdev_unregistering instead of open code

From: Juhee Kang <claudiajkang@gmail.com>
To: netdev@vger.kernel.org, simon.horman@corigine.com,
	kuba@kernel.org, davem@davemloft.net, edumazet@google.com,
	pabeni@redhat.com
Cc: skhan@linuxfoundation.org, Juhee Kang <claudiajkang@gmail.com>
Subject: [PATCH net-next 1/3] net: use netdev_unregistering instead of open code
Date: Sat, 24 Sep 2022 01:09:35 +0900	[thread overview]
Message-ID: <20220923160937.1912-1-claudiajkang@gmail.com> (raw)

The open code is defined as a helper function(netdev_unregistering)
on netdev.h, which the open code is dev->reg_state == NETREG_UNREGISTERING.
Thus, netdev_unregistering() replaces the open code. This patch doesn't
change logic.

Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
---
 net/core/dev.c       | 9 ++++-----
 net/core/net-sysfs.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index d66c73c1c734..f3f9394f0b5a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2886,8 +2886,7 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
 	if (txq < 1 || txq > dev->num_tx_queues)
 		return -EINVAL;
 
-	if (dev->reg_state == NETREG_REGISTERED ||
-	    dev->reg_state == NETREG_UNREGISTERING) {
+	if (dev->reg_state == NETREG_REGISTERED || netdev_unregistering(dev)) {
 		ASSERT_RTNL();
 
 		rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues,
@@ -5786,7 +5785,7 @@ static void flush_backlog(struct work_struct *work)
 
 	rps_lock_irq_disable(sd);
 	skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
-		if (skb->dev->reg_state == NETREG_UNREGISTERING) {
+		if (netdev_unregistering(skb->dev)) {
 			__skb_unlink(skb, &sd->input_pkt_queue);
 			dev_kfree_skb_irq(skb);
 			input_queue_head_incr(sd);
@@ -5795,7 +5794,7 @@ static void flush_backlog(struct work_struct *work)
 	rps_unlock_irq_enable(sd);
 
 	skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
-		if (skb->dev->reg_state == NETREG_UNREGISTERING) {
+		if (netdev_unregistering(skb->dev)) {
 			__skb_unlink(skb, &sd->process_queue);
 			kfree_skb(skb);
 			input_queue_head_incr(sd);
@@ -10708,7 +10707,7 @@ void free_netdev(struct net_device *dev)
 	 * handling may still be dismantling the device. Handle that case by
 	 * deferring the free.
 	 */
-	if (dev->reg_state == NETREG_UNREGISTERING) {
+	if (netdev_unregistering(dev)) {
 		ASSERT_RTNL();
 		dev->needs_free_netdev = true;
 		return;
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index d61afd21aab5..ec929bf15268 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1711,7 +1711,7 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
 	 * unregistered, but solely to remove queues from qdiscs. Any path
 	 * adding queues should be fixed.
 	 */
-	WARN(dev->reg_state == NETREG_UNREGISTERING && new_num > old_num,
+	WARN(netdev_unregistering(dev) && new_num > old_num,
 	     "New queues can't be registered after device unregistration.");
 
 	for (i = old_num; i < new_num; i++) {
-- 
2.34.1

