From: Oliver Neukum <oneukum@suse.com>
To: netdev@vger.kernel.org, grundler@chromium.org, andrew@lunn.ch,
davem@devemloft.org, hayeswang@realtek.com, kuba@kernel.org
Cc: Oliver Neukum <oneukum@suse.com>, Roland Dreier <roland@kernel.org>
Subject: [PATCHv3 3/3] CDC-NCM: record speed in status method
Date: Thu, 18 Feb 2021 11:20:38 +0100 [thread overview]
Message-ID: <20210218102038.2996-4-oneukum@suse.com> (raw)
In-Reply-To: <20210218102038.2996-1-oneukum@suse.com>
The driver has a status method for receiving speed updates.
The framework, however, had support functions only for devices
that reported their speed upon an explicit query over a MDIO
interface.
CDC_NCM however gets direct notifications from the device.
As new support functions have become available, we shall now
record such notifications and tell the usbnet framework
to make direct use of them without going through the PHY layer.
v2: rebased on upstream
v3: changed variable names
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Tested-by: Roland Dreier <roland@kernel.org>
---
drivers/net/usb/cdc_ncm.c | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 0d26cbeb6e04..74c1a86b1a71 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1829,30 +1829,9 @@ cdc_ncm_speed_change(struct usbnet *dev,
uint32_t rx_speed = le32_to_cpu(data->DLBitRRate);
uint32_t tx_speed = le32_to_cpu(data->ULBitRate);
- /* if the speed hasn't changed, don't report it.
- * RTL8156 shipped before 2021 sends notification about every 32ms.
- */
- if (dev->rx_speed == rx_speed && dev->tx_speed == tx_speed)
- return;
-
+ /* RTL8156 shipped before 2021 sends notification about every 32ms. */
dev->rx_speed = rx_speed;
dev->tx_speed = tx_speed;
-
- /*
- * Currently the USB-NET API does not support reporting the actual
- * device speed. Do print it instead.
- */
- if ((tx_speed > 1000000) && (rx_speed > 1000000)) {
- netif_info(dev, link, dev->net,
- "%u mbit/s downlink %u mbit/s uplink\n",
- (unsigned int)(rx_speed / 1000000U),
- (unsigned int)(tx_speed / 1000000U));
- } else {
- netif_info(dev, link, dev->net,
- "%u kbit/s downlink %u kbit/s uplink\n",
- (unsigned int)(rx_speed / 1000U),
- (unsigned int)(tx_speed / 1000U));
- }
}
static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
--
2.26.2
next prev parent reply other threads:[~2021-02-18 11:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 10:20 [PATCHv3 0/3]usbnet: speed reporting for devices without MDIO Oliver Neukum
2021-02-18 10:20 ` [PATCHv3 1/3] usbnet: specify naming of usbnet_set/get_link_ksettings Oliver Neukum
2021-02-18 19:06 ` Jakub Kicinski
2021-02-18 19:31 ` Grant Grundler
2021-02-18 19:50 ` Andrew Lunn
2021-02-19 7:12 ` Grant Grundler
2021-02-18 10:20 ` [PATCHv3 2/3] usbnet: add method for reporting speed without MDIO Oliver Neukum
2021-02-18 19:06 ` Jakub Kicinski
2021-02-18 10:20 ` Oliver Neukum [this message]
2021-02-19 7:30 ` [PATCHv3 3/3] CDC-NCM: record speed in status method Grant Grundler
2021-02-22 10:14 ` Oliver Neukum
2021-02-24 5:24 ` Grant Grundler
2021-03-20 5:24 ` Grant Grundler
2021-02-19 7:43 ` Grant Grundler
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=20210218102038.2996-4-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=andrew@lunn.ch \
--cc=davem@devemloft.org \
--cc=grundler@chromium.org \
--cc=hayeswang@realtek.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roland@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.