From: "Bjørn Mork" <bjorn@mork.no>
To: netdev@vger.kernel.org
Cc: linux-usb@vger.kernel.org,
"Alexey Orishko" <alexey.orishko@gmail.com>,
"Oliver Neukum" <oliver@neukum.org>,
"Enrico Mioso" <mrkiko.rs@gmail.com>,
"David Laight" <David.Laight@ACULAB.COM>,
"Lars Melin" <larsm17@gmail.com>, "Peter Stuge" <peter@stuge.se>,
"Greg Suarez" <gsuarez@smithmicro.com>,
"Bjørn Mork" <bjorn@mork.no>
Subject: [PATCH v2 net-next 5/8] net: cdc_ncm: drop ethtool coalesce support
Date: Fri, 30 May 2014 09:31:07 +0200 [thread overview]
Message-ID: <1401435070-26721-6-git-send-email-bjorn@mork.no> (raw)
In-Reply-To: <1401435070-26721-1-git-send-email-bjorn@mork.no>
The ethtool coalesce API is not applicable for this driver. Forcing
it to fit the NCM aggregation redefined the API in a driver specific
way, which is much worse than defining a clean new API. These ethtool
coalesce functions have therefore been replaced by a new sysfs API.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
drivers/net/usb/cdc_ncm.c | 48 -----------------------------------------------
1 file changed, 48 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 631741c8ff22..aaa440d892b8 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -127,54 +127,8 @@ static void cdc_ncm_get_strings(struct net_device __always_unused *netdev, u32 s
}
}
-static int cdc_ncm_get_coalesce(struct net_device *netdev,
- struct ethtool_coalesce *ec)
-{
- struct usbnet *dev = netdev_priv(netdev);
- struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
-
- /* assuming maximum sized dgrams and ignoring NDPs */
- ec->rx_max_coalesced_frames = ctx->rx_max / ctx->max_datagram_size;
- ec->tx_max_coalesced_frames = ctx->tx_max / ctx->max_datagram_size;
-
- /* the timer will fire CDC_NCM_TIMER_PENDING_CNT times in a row */
- ec->tx_coalesce_usecs = ctx->timer_interval / (NSEC_PER_USEC / CDC_NCM_TIMER_PENDING_CNT);
- return 0;
-}
-
static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx);
-static int cdc_ncm_set_coalesce(struct net_device *netdev,
- struct ethtool_coalesce *ec)
-{
- struct usbnet *dev = netdev_priv(netdev);
- struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
- u32 new_rx_max = ctx->rx_max;
- u32 new_tx_max = ctx->tx_max;
-
- /* assuming maximum sized dgrams and a single NDP */
- if (ec->rx_max_coalesced_frames)
- new_rx_max = ec->rx_max_coalesced_frames * ctx->max_datagram_size;
- if (ec->tx_max_coalesced_frames)
- new_tx_max = ec->tx_max_coalesced_frames * ctx->max_datagram_size;
-
- if (ec->tx_coalesce_usecs &&
- (ec->tx_coalesce_usecs < CDC_NCM_TIMER_INTERVAL_MIN * CDC_NCM_TIMER_PENDING_CNT ||
- ec->tx_coalesce_usecs > CDC_NCM_TIMER_INTERVAL_MAX * CDC_NCM_TIMER_PENDING_CNT))
- return -EINVAL;
-
- spin_lock_bh(&ctx->mtx);
- ctx->timer_interval = ec->tx_coalesce_usecs * (NSEC_PER_USEC / CDC_NCM_TIMER_PENDING_CNT);
- if (!ctx->timer_interval)
- ctx->tx_timer_pending = 0;
- spin_unlock_bh(&ctx->mtx);
-
- /* inform device of new values */
- if (new_rx_max != ctx->rx_max || new_tx_max != ctx->tx_max)
- cdc_ncm_update_rxtx_max(dev, new_rx_max, new_tx_max);
- return 0;
-}
-
static const struct ethtool_ops cdc_ncm_ethtool_ops = {
.get_settings = usbnet_get_settings,
.set_settings = usbnet_set_settings,
@@ -187,8 +141,6 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = {
.get_sset_count = cdc_ncm_get_sset_count,
.get_strings = cdc_ncm_get_strings,
.get_ethtool_stats = cdc_ncm_get_ethtool_stats,
- .get_coalesce = cdc_ncm_get_coalesce,
- .set_coalesce = cdc_ncm_set_coalesce,
};
static u32 cdc_ncm_check_rx_max(struct usbnet *dev, u32 new_rx)
--
2.0.0.rc4
next prev parent reply other threads:[~2014-05-30 7:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-30 7:31 [PATCH v2 net-next 0/8] cdc_ncm: fixes and conversion to sysfs API Bjørn Mork
2014-05-30 7:31 ` [PATCH v2 net-next 1/8] net: cdc_ncm: reduce skb truesize in rx path Bjørn Mork
[not found] ` <1401435070-26721-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
2014-05-30 7:31 ` [PATCH v2 net-next 2/8] net: cdc_ncm: always reallocate tx_curr_skb when tx_max increases Bjørn Mork
2014-05-30 7:31 ` [PATCH v2 net-next 4/8] net: cdc_ncm: use sysfs for rx/tx aggregation tuning Bjørn Mork
2014-05-30 7:31 ` [PATCH v2 net-next 3/8] net: cdc_ncm: inform usbnet when rx buffers are reduced Bjørn Mork
[not found] ` <1401435070-26721-4-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
2014-05-30 9:18 ` David Laight
2014-05-30 11:39 ` Bjørn Mork
2014-05-30 12:39 ` David Laight
2014-05-30 13:35 ` Bjørn Mork
[not found] ` <87d2eva41t.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2014-05-30 12:42 ` David Laight
2014-05-30 13:39 ` Bjørn Mork
2014-05-30 7:31 ` Bjørn Mork [this message]
2014-05-30 7:31 ` [PATCH v2 net-next 6/8] net: cdc_ncm: export NCM Transfer Block (NTB) parameters Bjørn Mork
2014-05-30 7:31 ` [PATCH v2 net-next 7/8] net: cdc_ncm: allow tuning min_tx_pkt Bjørn Mork
2014-05-30 7:31 ` [PATCH v2 net-next 8/8] net: cdc_ncm: document the sysfs API Bjørn Mork
2014-06-02 23:02 ` [PATCH v2 net-next 0/8] cdc_ncm: fixes and conversion to " David Miller
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=1401435070-26721-6-git-send-email-bjorn@mork.no \
--to=bjorn@mork.no \
--cc=David.Laight@ACULAB.COM \
--cc=alexey.orishko@gmail.com \
--cc=gsuarez@smithmicro.com \
--cc=larsm17@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=mrkiko.rs@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=peter@stuge.se \
/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).