net: Remove Intel NICs unnecessary driver assignments of ethtool_ringparam fields...

For e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf

Per comments from Ben Hutchings on a previous patch, sweep the floors
a little removing unnecessary assignments of zero to fields of struct
ethtool_ringparam in driver code supporting ethtool -g.

(backported from commit 8b0c11679fd37522d8d34a76101319a085d80912)
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 419440452a3d22f94e0d0482c7cc17d7824a76ce..9a394ad1baa63d5340a1ad3c69a6582c71da43d5 100644 (file)
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2503,12 +2503,8 @@ static void e100_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = rfds->max;
        ring->tx_max_pending = cbs->max;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rfds->count;
        ring->tx_pending = cbs->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int e100_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 5548d464261a6173fc1be5588960d858b33e8592..2b223ac99c421c9a6413e06f996ca4efc2f45a7a 100644 (file)
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -540,12 +540,8 @@ static void e1000_get_ringparam(struct net_device *netdev,
                E1000_MAX_82544_RXD;
        ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD :
                E1000_MAX_82544_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rxdr->count;
        ring->tx_pending = txdr->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int e1000_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 6a0526a59a8a38ce00e8c0aaeb9795db02d11d97..ef97cfa6f98b94827a5f2679a8b3c5dcc856b43f 100644 (file)
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -665,12 +665,8 @@ static void e1000_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = E1000_MAX_RXD;
        ring->tx_max_pending = E1000_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rx_ring->count;
        ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int e1000_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index cb407d49d57339071c11c2902ce4a21d37574cf0..d10089a1a6c99389eba8f6dc5cf98dc7c3ee885f 100644 (file)
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -764,12 +764,8 @@ static void igb_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = IGB_MAX_RXD;
        ring->tx_max_pending = IGB_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = adapter->rx_ring_count;
        ring->tx_pending = adapter->tx_ring_count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int igb_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index b0b14d63dfbf391c10b1ba1905a7f6aee7e6d929..0ee8b684584676934c46154f5fc07dc89374193c 100644 (file)
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -259,12 +259,8 @@ static void igbvf_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = IGBVF_MAX_RXD;
        ring->tx_max_pending = IGBVF_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rx_ring->count;
        ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int igbvf_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 6da890b9534cf1ae25d3c8db4932609d915b78cf..2086c92df4d771e9e8f938e920ed75c591cb57a2 100644 (file)
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -543,12 +543,8 @@ ixgb_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = MAX_RXD;
        ring->tx_max_pending = MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rxdr->count;
        ring->tx_pending = txdr->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index dc605398c176cd2e880e048088e5eefa13b5221a..ca6f8cfa294a91acc0dbefb8acb54be34e4a73c3 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -843,12 +843,8 @@ static void ixgbe_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = IXGBE_MAX_RXD;
        ring->tx_max_pending = IXGBE_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rx_ring->count;
        ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int ixgbe_set_ringparam(struct net_device *netdev,

diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ixgbevf/ethtool.c
index deee3754b1f7a29e186c8b90549fb438c7d350a4..b5052b3f9cb97880fd76a2030dddb9598ab5b87d 100644 (file)
--- a/drivers/net/ixgbevf/ethtool.c
+++ b/drivers/net/ixgbevf/ethtool.c
@@ -319,12 +319,8 @@ static void ixgbevf_get_ringparam(struct net_device *netdev,
 
        ring->rx_max_pending = IXGBEVF_MAX_RXD;
        ring->tx_max_pending = IXGBEVF_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
        ring->rx_pending = rx_ring->count;
        ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
 }
 
 static int ixgbevf_set_ringparam(struct net_device *netdev,