From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 02/11] net: remove netif_set_real_num_rx_queues() helper for when SYSFS=n
Date: Mon, 24 Mar 2025 15:45:28 -0700 [thread overview]
Message-ID: <20250324224537.248800-3-kuba@kernel.org> (raw)
In-Reply-To: <20250324224537.248800-1-kuba@kernel.org>
Since commit a953be53ce40 ("net-sysfs: add support for device-specific
rx queue sysfs attributes"), so for at least a decade now it is safe
to call net_rx_queue_update_kobjects() when SYSFS=n. That function
does its own ifdef-inery and will return 0. Remove the unnecessary
stub for netif_set_real_num_rx_queues().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
include/linux/netdevice.h | 10 ----------
net/core/dev.c | 2 --
2 files changed, 12 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f22cca7c03ad..55859c565f84 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4062,17 +4062,7 @@ static inline bool netif_is_multiqueue(const struct net_device *dev)
}
int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq);
-
-#ifdef CONFIG_SYSFS
int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq);
-#else
-static inline int netif_set_real_num_rx_queues(struct net_device *dev,
- unsigned int rxqs)
-{
- dev->real_num_rx_queues = rxqs;
- return 0;
-}
-#endif
int netif_set_real_num_queues(struct net_device *dev,
unsigned int txq, unsigned int rxq);
diff --git a/net/core/dev.c b/net/core/dev.c
index bcf81c3ff6a3..1a6e62792bb5 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3160,7 +3160,6 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
}
EXPORT_SYMBOL(netif_set_real_num_tx_queues);
-#ifdef CONFIG_SYSFS
/**
* netif_set_real_num_rx_queues - set actual number of RX queues used
* @dev: Network device
@@ -3191,7 +3190,6 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
return 0;
}
EXPORT_SYMBOL(netif_set_real_num_rx_queues);
-#endif
/**
* netif_set_real_num_queues - set actual number of RX and TX queues used
--
2.49.0
next prev parent reply other threads:[~2025-03-24 22:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 22:45 [PATCH net-next v2 00/11] net: skip taking rtnl_lock for queue GET Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 01/11] net: bubble up taking netdev instance lock to callers of net_devmem_unbind_dmabuf() Jakub Kicinski
2025-03-25 5:19 ` Mina Almasry
2025-03-24 22:45 ` Jakub Kicinski [this message]
2025-03-24 22:45 ` [PATCH net-next v2 03/11] net: constify dev pointer in misc instance lock helpers Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 04/11] net: explain "protection types" for the instance lock Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 05/11] net: designate queue counts as "double ops protected" by " Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 06/11] net: designate queue -> napi linking as "ops protected" Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 07/11] net: protect rxq->mp_params with the instance lock Jakub Kicinski
2025-03-25 5:34 ` Mina Almasry
2025-03-25 9:50 ` Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 08/11] net: make NETDEV_UNREGISTER and instance lock more consistent Jakub Kicinski
2025-03-25 12:17 ` Cosmin Ratiu
2025-03-25 17:04 ` Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 09/11] net: designate XSK pool pointers in queues as "ops protected" Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 10/11] netdev: add "ops compat locking" helpers Jakub Kicinski
2025-03-24 22:45 ` [PATCH net-next v2 11/11] netdev: don't hold rtnl_lock over nl queue info get when possible Jakub Kicinski
2025-03-25 4:04 ` [PATCH net-next v2 00/11] net: skip taking rtnl_lock for queue GET Stanislav Fomichev
2025-03-25 17:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250324224537.248800-3-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).