diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-12 14:04:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-12 14:04:07 -0400 |
| commit | 6de825a8d5bd1129aa8a7bf6b919bfe3c355ec33 (patch) | |
| tree | 67d737f3bf7a15723e5cb22fbbd3383550240726 | |
| parent | 734486c75a659d0dffd8034a9328c884cd6a41c6 (diff) | |
| download | longterm-queue-4.18-6de825a8d5bd1129aa8a7bf6b919bfe3c355ec33.tar.gz | |
net: drop ti commit - breaks build
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-ethernet-ti-cpsw_ethtool-fix-ethtool-ring-param-.patch | 33 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/queue/net-ethernet-ti-cpsw_ethtool-fix-ethtool-ring-param-.patch b/queue/net-ethernet-ti-cpsw_ethtool-fix-ethtool-ring-param-.patch deleted file mode 100644 index 351e902..0000000 --- a/queue/net-ethernet-ti-cpsw_ethtool-fix-ethtool-ring-param-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4f6376b292e2336d6256dc445411c961e417e584 Mon Sep 17 00:00:00 2001 -From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> -Date: Fri, 31 May 2019 16:47:25 +0300 -Subject: [PATCH] net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set - -commit 09faf5a7d7c0bcb07faba072f611937af9dd5788 upstream. - -Fix ability to set RX descriptor number, the reason - initially -"tx_max_pending" was set incorrectly, but the issue appears after -adding sanity check, so fix is for "sanity" patch. - -Fixes: 37e2d99b59c476 ("ethtool: Ensure new ring parameters are within bounds during SRINGPARAM") -Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> -Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c -index 3e34cb8ac1d3..bf927b2c5b17 100644 ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -2632,7 +2632,7 @@ static void cpsw_get_ringparam(struct net_device *ndev, - struct cpsw_common *cpsw = priv->cpsw; - - /* not supported */ -- ering->tx_max_pending = 0; -+ ering->tx_max_pending = cpsw->descs_pool_size - CPSW_MAX_QUEUES; - ering->tx_pending = cpdma_get_num_tx_descs(cpsw->dma); - ering->rx_max_pending = descs_pool_size - CPSW_MAX_QUEUES; - ering->rx_pending = cpdma_get_num_rx_descs(cpsw->dma); --- -2.7.4 - diff --git a/queue/series b/queue/series index 8a11b7b..8233874 100644 --- a/queue/series +++ b/queue/series @@ -86,7 +86,6 @@ ethtool-fix-potential-userspace-buffer-overflow.patch Fix-memory-leak-in-sctp_process_init.patch ipv6-fix-the-check-before-getting-the-cookie-in-rt6_.patch neighbor-Call-__ipv4_neigh_lookup_noref-in-neigh_xmi.patch -net-ethernet-ti-cpsw_ethtool-fix-ethtool-ring-param-.patch net-mlx4_en-ethtool-Remove-unsupported-SFP-EEPROM-hi.patch net-mvpp2-Use-strscpy-to-handle-stat-strings.patch net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch |