Attachment 316109 Details for Bug 460349 – igb-52-fix.patch

[patch] igb-52-fix.patch

igb-52-fix.patch (text/plain), 2.29 KB, created by Andy Gospodarek on 2008-09-08 17:59:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2008-09-08 17:59:34 UTC

Size: 2.29 KB

patch

obsolete

>diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
>index 02b9634..35a81ad 100644
>--- a/drivers/net/igb/igb_main.c
>+++ b/drivers/net/igb/igb_main.c
>@@ -671,6 +671,7 @@ static void igb_configure(struct igb_adapter *adapter)
> int igb_up(struct igb_adapter *adapter)
> {
> 	struct e1000_hw *hw = &adapter->hw;
>+	int i;
> 
> 	/* hardware has been reset, we need to reload some things */
> 	igb_configure(adapter);
>@@ -678,6 +679,8 @@ int igb_up(struct igb_adapter *adapter)
> 	clear_bit(__IGB_DOWN, &adapter->state);
> 
> 	netif_poll_enable(adapter->netdev);
>+	for (i = 0; i < adapter->num_rx_queues; i++)
>+		netif_poll_enable(adapter->rx_ring[i].netdev);
> 
> 	if (adapter->msix_entries) {
> 		igb_configure_msix(adapter);
>@@ -697,6 +700,7 @@ void igb_down(struct igb_adapter *adapter)
> 	struct e1000_hw *hw = &adapter->hw;
> 	struct net_device *netdev = adapter->netdev;
> 	u32 tctl, rctl;
>+	int i;
> 
> 	/* signal that we're down so the interrupt handler does not
> 	 * reschedule our watchdog timer */
>@@ -718,6 +722,9 @@ void igb_down(struct igb_adapter *adapter)
> 	msleep(10);
> 
> 	netif_poll_disable(netdev);
>+	for (i = 0; i < adapter->num_rx_queues; i++)
>+		netif_poll_disable(adapter->rx_ring[i].netdev);
>+
> 	igb_irq_disable(adapter);
> 
> 	del_timer_sync(&adapter->watchdog_timer);
>@@ -1084,7 +1091,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
> 	/* tell the stack to leave us alone until igb_open() is called */
> 	netif_carrier_off(netdev);
> 	netif_stop_queue(netdev);
>-	netif_poll_disable(netdev);
> 
> 	strcpy(netdev->name, "eth%d");
> 	err = register_netdev(netdev);
>@@ -1245,7 +1251,7 @@ static int igb_open(struct net_device *netdev)
> {
> 	struct igb_adapter *adapter = netdev_priv(netdev);
> 	struct e1000_hw *hw = &adapter->hw;
>-	int err;
>+	int err, i;
> 
> 	/* disallow open during test */
> 	if (test_bit(__IGB_TESTING, &adapter->state))
>@@ -1282,11 +1288,16 @@ static int igb_open(struct net_device *netdev)
> 	clear_bit(__IGB_DOWN, &adapter->state);
> 
> 	netif_poll_enable(netdev);
>-
>-	igb_irq_enable(adapter);
>+	for (i = 0; i < adapter->num_rx_queues; i++)
>+		netif_poll_enable(adapter->rx_ring[i].netdev);
> 
> 	/* Clear any pending interrupts. */
> 	rd32(E1000_ICR);
>+
>+	igb_irq_enable(adapter);
>+
>+	netif_start_queue(netdev);
>+
> 	/* Fire a link status change interrupt to start the watchdog. */
> 	wr32(E1000_ICS, E1000_ICS_LSC);
>

Actions: View | Diff

Attachments on bug 460349: 316109