From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: mkubecek@suse.cz, netdev@vger.kernel.org,
simon.horman@netronome.com, kernel-team@fb.com,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 2/3] nfp: don't check lack of RX/TX channels
Date: Fri, 15 May 2020 12:49:01 -0700 [thread overview]
Message-ID: <20200515194902.3103469-3-kuba@kernel.org> (raw)
In-Reply-To: <20200515194902.3103469-1-kuba@kernel.org>
Core will now perform this check.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index a5aa3219d112..6eb9fb9a1814 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -1438,8 +1438,7 @@ static int nfp_net_set_channels(struct net_device *netdev,
unsigned int total_rx, total_tx;
/* Reject unsupported */
- if (!channel->combined_count ||
- channel->other_count != NFP_NET_NON_Q_VECTORS ||
+ if (channel->other_count != NFP_NET_NON_Q_VECTORS ||
(channel->rx_count && channel->tx_count))
return -EINVAL;
--
2.25.4
next prev parent reply other threads:[~2020-05-15 19:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 19:48 [PATCH net-next 0/3] ethtool: set_channels: add a few more checks Jakub Kicinski
2020-05-15 19:49 ` [PATCH net-next 1/3] ethtool: check if there is at least one channel for TX/RX in the core Jakub Kicinski
2020-05-15 20:56 ` Michal Kubecek
2020-05-15 22:26 ` Jakub Kicinski
2020-05-15 19:49 ` Jakub Kicinski [this message]
2020-05-15 20:59 ` [PATCH net-next 2/3] nfp: don't check lack of RX/TX channels Michal Kubecek
2020-05-18 11:44 ` Simon Horman
2020-05-15 19:49 ` [PATCH net-next 3/3] ethtool: don't call set_channels in drivers if config didn't change Jakub Kicinski
2020-05-15 21:01 ` Michal Kubecek
2020-05-16 20:56 ` [PATCH net-next 0/3] ethtool: set_channels: add a few more checks David Miller
2020-05-16 21:13 ` Michal Kubecek
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=20200515194902.3103469-3-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@netronome.com \
/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).