Attachment 132201 Details for Bug 176446 – releng-8.4.patch

[patch] releng-8.4.patch

releng-8.4.patch (text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"), 1.41 KB, created by jcharbon on 2013-09-05 14:05:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jcharbon

Created: 2013-09-05 14:05:15 UTC

Size: 1.41 KB

patch

obsolete

>diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
>index df37621..9a00517 100644
>--- a/sys/dev/ixgbe/ixgbe.c
>+++ b/sys/dev/ixgbe/ixgbe.c
>@@ -1396,23 +1396,6 @@ ixgbe_disable_queue(struct adapter *adapter, u32 vector)
> 	}
> }
> 
>-static inline void
>-ixgbe_rearm_queues(struct adapter *adapter, u64 queues)
>-{
>-	u32 mask;
>-
>-	if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
>-		mask = (IXGBE_EIMS_RTX_QUEUE & queues);
>-		IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);
>-	} else {
>-		mask = (queues & 0xFFFFFFFF);
>-		IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(0), mask);
>-		mask = (queues >> 32);
>-		IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(1), mask);
>-	}
>-}
>-
>-
> static void
> ixgbe_handle_que(void *context, int pending)
> {
>@@ -2046,14 +2029,13 @@ ixgbe_local_timer(void *arg)
> 		    (paused == 0))
> 			++hung;
> 		else if (txr->queue_status == IXGBE_QUEUE_WORKING)
>-			taskqueue_enqueue(que->tq, &que->que_task);
>+			taskqueue_enqueue(que->tq, &txr->txq_task);
>         }
> 	/* Only truely watchdog if all queues show hung */
>         if (hung == adapter->num_tx_queues)
>                 goto watchdog;
> 
> out:
>-	ixgbe_rearm_queues(adapter, adapter->que_mask);
> 	callout_reset(&adapter->timer, hz, ixgbe_local_timer, adapter);
> 	return;
> 
>@@ -4559,7 +4541,6 @@ next_desc:
> 	** Schedule another interrupt if so.
> 	*/
> 	if ((staterr & IXGBE_RXD_STAT_DD) != 0) {
>-		ixgbe_rearm_queues(adapter, (u64)(1 << que->msix));
> 		return (TRUE);
> 	}
>

Actions: View | Diff

Attachments on bug 176446: 132199 | 132200 | 132201