From a8312d26f133500d0bb420178258be5ce3fe9f1c Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Wed, 18 Jan 2006 13:01:45 -0800 Subject: [PATCH] --- yaml --- r: 18861 b: refs/heads/master c: 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 h: refs/heads/master i: 18859: 7f84c4e8028ce947090897a77f6f74fb7062395e v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3da039d6356a..25d80a62acf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86c3d59ff54c31f07d0f0483dd3f668107c8cf85 +refs/heads/master: 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 401be1f19119..31e332935e5a 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -2186,9 +2186,9 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter) e1000_pci_set_mwi(&adapter->hw); if (netif_running(netdev)) { - e1000_configure_rx(adapter); /* No need to loop, because 82542 supports only 1 queue */ struct e1000_rx_ring *ring = &adapter->rx_ring[0]; + e1000_configure_rx(adapter); adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); } }