Commit dd4a59a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] sky2: optimize receive restart
  [PATCH] sky2: PHY power on delays
  [PATCH] sky2: NAPI suspend/resume of dual port cards
  [PATCH] sky2: sky2_reset section mismatch
  [PATCH] sk98lin: fix truncated collision threshold mask
  [PATCH] skge: fix truncated collision threshold mask
  [PATCH] sky2: fix truncated collision threshold mask
  [PATCH] myri10ge return value fix
  [PATCH] Update smc91x driver with ARM Versatile board info
  [PATCH] ixgb: fix tx unit hang - properly calculate desciptor count
  [PATCH] smsc-ircc2: fix section reference mismatches
  [PATCH] 8139cp.c printk fix
  [PATCH] s2io driver irq fix
  [PATCH] e1000: irq naming update
  [PATCH] forcedeth: watermark fixup
  [PATCH] forcedeth: deferral fixup
  [PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context
  [PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
parents 155dbfd8 22e11703

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -1916,7 +1916,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	regs = ioremap(pciaddr, CP_REGS_SIZE);

	if (!regs) {

		rc = -EIO;

		dev_err(&pdev->dev, "Cannot map PCI MMIO (%lx@%lx)\n",

		dev_err(&pdev->dev, "Cannot map PCI MMIO (%Lx@%Lx)\n",

		       (unsigned long long)pci_resource_len(pdev, 1),

		       (unsigned long long)pciaddr);

		goto err_out_res;

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) 
		}

	}

	if (adapter->have_msi)

		flags &= ~SA_SHIRQ;

		flags &= ~IRQF_SHARED;

#endif

	if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,

	                       netdev->name, netdev)))

drivers/net/forcedeth.c

+38 −11
Original line number Diff line number Diff line
@@ -240,10 +240,12 @@ enum { 
#define NVREG_RNDSEED_FORCE2	0x2d00

#define NVREG_RNDSEED_FORCE3	0x7400



	NvRegUnknownSetupReg1 = 0xA0,

#define NVREG_UNKSETUP1_VAL	0x16070f

	NvRegUnknownSetupReg2 = 0xA4,

#define NVREG_UNKSETUP2_VAL	0x16

	NvRegTxDeferral = 0xA0,

#define NVREG_TX_DEFERRAL_DEFAULT	0x15050f

#define NVREG_TX_DEFERRAL_RGMII_10_100	0x16070f

#define NVREG_TX_DEFERRAL_RGMII_1000	0x14050f

	NvRegRxDeferral = 0xA4,

#define NVREG_RX_DEFERRAL_DEFAULT	0x16

	NvRegMacAddrA = 0xA8,

	NvRegMacAddrB = 0xAC,

	NvRegMulticastAddrA = 0xB0,
@@ -269,8 +271,10 @@ enum { 
#define NVREG_LINKSPEED_MASK	(0xFFF)

	NvRegUnknownSetupReg5 = 0x130,

#define NVREG_UNKSETUP5_BIT31	(1<<31)

	NvRegUnknownSetupReg3 = 0x13c,

#define NVREG_UNKSETUP3_VAL1	0x200010

	NvRegTxWatermark = 0x13c,

#define NVREG_TX_WM_DESC1_DEFAULT	0x0200010

#define NVREG_TX_WM_DESC2_3_DEFAULT	0x1e08000

#define NVREG_TX_WM_DESC2_3_1000	0xfe08000

	NvRegTxRxControl = 0x144,

#define NVREG_TXRXCTL_KICK	0x0001

#define NVREG_TXRXCTL_BIT1	0x0002
@@ -658,7 +662,7 @@ static const struct register_test nv_registers_test[] = { 
	{ NvRegMisc1, 0x03c },

	{ NvRegOffloadConfig, 0x03ff },

	{ NvRegMulticastAddrA, 0xffffffff },

	{ NvRegUnknownSetupReg3, 0x0ff },

	{ NvRegTxWatermark, 0x0ff },

	{ NvRegWakeUpFlags, 0x07777 },

	{ 0,0 }

};
@@ -2127,7 +2131,7 @@ static int nv_update_linkspeed(struct net_device *dev) 
	int newdup = np->duplex;

	int mii_status;

	int retval = 0;

	u32 control_1000, status_1000, phyreg, pause_flags;

	u32 control_1000, status_1000, phyreg, pause_flags, txreg;



	/* BMSR_LSTATUS is latched, read it twice:

	 * we want the current value.
@@ -2245,6 +2249,26 @@ set_speed: 
		phyreg |= PHY_1000;

	writel(phyreg, base + NvRegPhyInterface);



	if (phyreg & PHY_RGMII) {

		if ((np->linkspeed & NVREG_LINKSPEED_MASK) == NVREG_LINKSPEED_1000)

			txreg = NVREG_TX_DEFERRAL_RGMII_1000;

		else

			txreg = NVREG_TX_DEFERRAL_RGMII_10_100;

	} else {

		txreg = NVREG_TX_DEFERRAL_DEFAULT;

	}

	writel(txreg, base + NvRegTxDeferral);



	if (np->desc_ver == DESC_VER_1) {

		txreg = NVREG_TX_WM_DESC1_DEFAULT;

	} else {

		if ((np->linkspeed & NVREG_LINKSPEED_MASK) == NVREG_LINKSPEED_1000)

			txreg = NVREG_TX_WM_DESC2_3_1000;

		else

			txreg = NVREG_TX_WM_DESC2_3_DEFAULT;

	}

	writel(txreg, base + NvRegTxWatermark);



	writel(NVREG_MISC1_FORCE | ( np->duplex ? 0 : NVREG_MISC1_HD),

		base + NvRegMisc1);

	pci_push(base);
@@ -3910,7 +3934,10 @@ static int nv_open(struct net_device *dev) 


	/* 5) continue setup */

	writel(np->linkspeed, base + NvRegLinkSpeed);

	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);

	if (np->desc_ver == DESC_VER_1)

		writel(NVREG_TX_WM_DESC1_DEFAULT, base + NvRegTxWatermark);

	else

		writel(NVREG_TX_WM_DESC2_3_DEFAULT, base + NvRegTxWatermark);

	writel(np->txrxctl_bits, base + NvRegTxRxControl);

	writel(np->vlanctl_bits, base + NvRegVlanControl);

	pci_push(base);
@@ -3932,8 +3959,8 @@ static int nv_open(struct net_device *dev) 
	writel(readl(base + NvRegReceiverStatus), base + NvRegReceiverStatus);

	get_random_bytes(&i, sizeof(i));

	writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);

	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);

	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);

	writel(NVREG_TX_DEFERRAL_DEFAULT, base + NvRegTxDeferral);

	writel(NVREG_RX_DEFERRAL_DEFAULT, base + NvRegRxDeferral);

	if (poll_interval == -1) {

		if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)

			writel(NVREG_POLL_DEFAULT_THROUGHPUT, base + NvRegPollingInterval);

drivers/net/irda/smsc-ircc2.c

+1 −1
Original line number Diff line number Diff line
@@ -2353,7 +2353,7 @@ static int __init smsc_superio_lpc(unsigned short cfg_base) 
#ifdef CONFIG_PCI

#define PCIID_VENDOR_INTEL 0x8086

#define PCIID_VENDOR_ALI 0x10b9

static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {

static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {

	{

		.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */

		.device = 0x24cc,

drivers/net/ixgb/ixgb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, 


	while(len) {

		buffer_info = &tx_ring->buffer_info[i];

		size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);

		size = min(len, IXGB_MAX_DATA_PER_TXD);

		buffer_info->length = size;

		buffer_info->dma =

			pci_map_single(adapter->pdev,
@@ -1306,7 +1306,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, 


		while(len) {

			buffer_info = &tx_ring->buffer_info[i];

			size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);

			size = min(len, IXGB_MAX_DATA_PER_TXD);

			buffer_info->length = size;

			buffer_info->dma =

				pci_map_page(adapter->pdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE