| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 May 2014 09:31:07 +0200
From: Bjørn Mork <bjorn@...k.no>
To: netdev@...r.kernel.org
Cc: <linux-usb@...r.kernel.org>,
Alexey Orishko <alexey.orishko@...il.com>,
Oliver Neukum <oliver@...kum.org>,
Enrico Mioso <mrkiko.rs@...il.com>,
David Laight <David.Laight@...LAB.COM>,
Lars Melin <larsm17@...il.com>, Peter Stuge <peter@...ge.se>,
Greg Suarez <gsuarez@...thmicro.com>,
Bjørn Mork <bjorn@...k.no>
Subject: [PATCH v2 net-next 5/8] net: cdc_ncm: drop ethtool coalesce support
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@...k.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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists