From: Wei Yang Date: Mon, 20 May 2013 17:31:09 +0000 (+0000) Subject: e1000e: Remove duplicate assignment of default rx/tx ring size X-Git-Tag: MMI-PSA29.97-13-9~13727^2~445^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2592881990198f2b63eefcbc914a7d5259b25580;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git e1000e: Remove duplicate assignment of default rx/tx ring size 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 Reviewed-by: Gavin Shan Reviewed-by: Da Yu Qiu Tested-by: Aaron Brown Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 5475cf49d695..40e6232bed27 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6725,10 +6725,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 */