Patchwork [1/4] e1000e: Remove duplicate assignment of default rx/tx ring size

login
register
mail settings
Submitter Wei Yang
Date May 20, 2013, 8:15 a.m.
Message ID <1369037707-27026-2-git-send-email-weiyang@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/244862/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Wei Yang - May 20, 2013, 8:15 a.m.
tx_ring/rx_ring size is assigned in function e1000_alloc_queues(), which is
called by e1000_sw_init() in the early stage of e1000_probe().

This patch just remove the duplicate assignment of this default ring size
value.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Reviewed-by: Da Yu Qiu <qiudayu@cn.ibm.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
Jeff Kirsher - May 20, 2013, 9:37 a.m.
On 05/20/2013 01:15 AM, Wei Yang wrote:
> tx_ring/rx_ring size is assigned in function e1000_alloc_queues(), which is
> called by e1000_sw_init() in the early stage of e1000_probe().
>
> This patch just remove the duplicate assignment of this default ring size
> value.
>
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
> Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
> Reviewed-by: Da Yu Qiu <qiudayu@cn.ibm.com>
> ---
>  drivers/net/ethernet/intel/e1000e/netdev.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
Thanks, I have added the patch to my queue for e1000e.
Wei Yang - May 20, 2013, 4:24 p.m.
On Mon, May 20, 2013 at 02:37:16AM -0700, Jeff Kirsher wrote:
>On 05/20/2013 01:15 AM, Wei Yang wrote:
>> tx_ring/rx_ring size is assigned in function e1000_alloc_queues(), which is
>> called by e1000_sw_init() in the early stage of e1000_probe().
>>
>> This patch just remove the duplicate assignment of this default ring size
>> value.
>>
>> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>> Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
>> Reviewed-by: Da Yu Qiu <qiudayu@cn.ibm.com>
>> ---
>>  drivers/net/ethernet/intel/e1000e/netdev.c |    4 ----
>>  1 files changed, 0 insertions(+), 4 deletions(-)
>Thanks, I have added the patch to my queue for e1000e.

Thanks~

>

Patch

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 7e615e2..5cb8321 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6707,10 +6707,6 @@  static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	adapter->hw.fc.current_mode = e1000_fc_default;
 	adapter->hw.phy.autoneg_advertised = 0x2f;
 
-	/* ring size defaults */
-	adapter->rx_ring->count = E1000_DEFAULT_RXD;
-	adapter->tx_ring->count = E1000_DEFAULT_TXD;
-
 	/* Initial Wake on LAN setting - If APM wake is enabled in
 	 * the EEPROM, enable the ACPI Magic Packet filter
 	 */