summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorjfv <jfv@FreeBSD.org>2010-06-11 19:03:59 +0000
committerjfv <jfv@FreeBSD.org>2010-06-11 19:03:59 +0000
commita674331779d7d47acd30342c7763589ace0b1fea (patch)
tree3174dc1a15f4e06cb13a3e3a91210ca5b3991de8 /sys/dev
parent9b74a62d735d756ad10a232bb6b9bf1d5803a473 (diff)
downloadFreeBSD-src-a674331779d7d47acd30342c7763589ace0b1fea.zip
FreeBSD-src-a674331779d7d47acd30342c7763589ace0b1fea.tar.gz
Remove a disable_queue from the beginning of the
interrupt handler, automask handles it. Also, add in msix vector descriptions. MFC for 8.1 asap
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ixgbe/ixgbe.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index 6b5e65e..b3b9352 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -1365,7 +1365,6 @@ ixgbe_msix_que(void *arg)
bool more_tx, more_rx;
u32 newitr = 0;
- ixgbe_disable_queue(adapter, que->msix);
++que->irqs;
more_rx = ixgbe_rxeof(que, adapter->rx_process_limit);
@@ -2121,6 +2120,9 @@ ixgbe_allocate_msix(struct adapter *adapter)
device_printf(dev, "Failed to register QUE handler");
return (error);
}
+#if __FreeBSD_version >= 800504
+ bus_describe_intr(dev, que->res, que->tag, "que %d", i);
+#endif
que->msix = vector;
adapter->que_mask |= (u64)(1 << que->msix);
/*
@@ -2155,6 +2157,9 @@ ixgbe_allocate_msix(struct adapter *adapter)
device_printf(dev, "Failed to register LINK handler");
return (error);
}
+#if __FreeBSD_version >= 800504
+ bus_describe_intr(dev, adapter->res, adapter->tag, "link");
+#endif
adapter->linkvec = vector;
/* Tasklets for Link, SFP and Multispeed Fiber */
TASK_INIT(&adapter->link_task, 0, ixgbe_handle_link, adapter);
OpenPOWER on IntegriCloud