Home » Mailing list archives » linux-netdev » 2008 » September » 3

Re: [git patches] net driver fixes for .26

Previous thread: [PATCH] sfc: Fix type of FALCON_SPI_MAX_LEN by Ben Hutchings on Wednesday, September 3, 2008 - 7:37 am. (1 message)

Next thread: [git patches] net driver updates for .28 by Jeff Garzik on Wednesday, September 3, 2008 - 7:37 am. (2 messages)
[view original message]
From: Jeff Garzik
Subject: [git patches] net driver fixes for .26
Date: Wednesday, September 3, 2008 - 7:37 am

Please pull from 'davem-fixes' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-fixes

to receive the following updates:

 drivers/net/ixgbe/ixgbe_main.c       |    6 ++++++
 drivers/net/netxen/netxen_nic_main.c |   10 ----------
 drivers/net/pcmcia/axnet_cs.c        |    1 +
 drivers/net/pcmcia/pcnet_cs.c        |    2 +-
 drivers/net/usb/pegasus.c            |   11 ++++++-----
 5 files changed, 14 insertions(+), 16 deletions(-)

Andy Gospodarek (1):
      ixgbe: initialize interrupt throttle rate

David Brownell (1):
      net/usb/pegasus: avoid hundreds of diagnostics

Dhananjay Phadke (1):
      netxen: Remove workaround for chipset quirk

Komuro (1):
      pcnet-cs, axnet_cs: add new IDs, remove dup ID with less info

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 53f41b6..a417be7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2304,6 +2304,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter
 	int vector, v_budget;
 
 	/*
+	 * Set the default interrupt throttle rate.
+	 */
+	adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);
+	adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);
+
+	/*
 	 * It's easy to be greedy for MSI-X vectors, but it really
 	 * doesn't do us much good if we have a lot more vectors
 	 * than CPU's.  So let's be conservative and only ask for
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 32bb47a..008fd66 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -359,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter)
 	int i, pos;
 	struct pci_dev *pdev;
 
-	pdev = pci_get_device(0x1166, 0x0140, NULL);
-	if (pdev) {
-		pci_dev_put(pdev);
-		adapter->hw_read_wx(adapter,
-			NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4);
-		chicken |= ...
[ message continues ]
[view original message]
From: Jeff Garzik
Subject: Re: [git patches] net driver fixes for .26
Date: Wednesday, September 3, 2008 - 7:38 am

The subject line should say "for .27" obviously...

Gonna go back in time... </BTTF song>

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [git patches] net driver fixes for .26
Date: Wednesday, September 3, 2008 - 2:44 pm

From: Jeff Garzik <jeff@garzik.org>
--


[ message continues ]
Previous thread: [PATCH] sfc: Fix type of FALCON_SPI_MAX_LEN by Ben Hutchings on Wednesday, September 3, 2008 - 7:37 am. (1 message)

Next thread: [git patches] net driver updates for .28 by Jeff Garzik on Wednesday, September 3, 2008 - 7:37 am. (2 messages)