Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ecc103a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/gianfar.c
parents 0012985d 4906f998

drivers/atm/solos-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) 
 out_release_regions:

	pci_release_regions(dev);

 out:

	kfree(card);

	return err;

}

drivers/isdn/hardware/mISDN/hfcmulti.c

+2 −0
Original line number Diff line number Diff line
@@ -4599,6 +4599,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m) 
			printk(KERN_ERR "%s: no memory for coeffs\n",

			    __func__);

			ret = -ENOMEM;

			kfree(bch);

			goto free_chan;

		}

		bch->nr = ch;
@@ -4767,6 +4768,7 @@ init_multi_port(struct hfc_multi *hc, int pt) 
			printk(KERN_ERR "%s: no memory for coeffs\n",

			    __func__);

			ret = -ENOMEM;

			kfree(bch);

			goto free_chan;

		}

		bch->nr = ch + 1;

drivers/net/gianfar.c

+6 −0
Original line number Diff line number Diff line
@@ -1668,6 +1668,12 @@ static void gfar_schedule_cleanup(struct net_device *dev) 
	if (napi_schedule_prep(&priv->napi)) {

		gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);

		__napi_schedule(&priv->napi);

	} else {

		/*

		 * Clear IEVENT, so interrupts aren't called again

		 * because of the packets that have already arrived.

		 */

		gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK);

	}



	spin_unlock(&priv->rxlock);

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ typedef struct { 
#define NETXEN_IS_MSI_FAMILY(adapter) \

	((adapter)->flags & (NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED))



#define MSIX_ENTRIES_PER_ADAPTER	8

#define MSIX_ENTRIES_PER_ADAPTER	1

#define NETXEN_MSIX_TBL_SPACE		8192

#define NETXEN_PCI_REG_MSIX_TBL		0x44

drivers/net/netxen/netxen_nic_main.c

+12 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static void netxen_nic_poll_controller(struct net_device *netdev); 
#endif

static irqreturn_t netxen_intr(int irq, void *data);

static irqreturn_t netxen_msi_intr(int irq, void *data);

static irqreturn_t netxen_msix_intr(int irq, void *data);



/*  PCI Device ID Table  */

#define ENTRY(device) \
@@ -1084,7 +1085,9 @@ static int netxen_nic_open(struct net_device *netdev) 
			for (ring = 0; ring < adapter->max_rds_rings; ring++)

				netxen_post_rx_buffers(adapter, ctx, ring);

		}

		if (NETXEN_IS_MSI_FAMILY(adapter))

		if (adapter->flags & NETXEN_NIC_MSIX_ENABLED)

			handler = netxen_msix_intr;

		else if (adapter->flags & NETXEN_NIC_MSI_ENABLED)

			handler = netxen_msi_intr;

		else {

			flags |= IRQF_SHARED;
@@ -1612,6 +1615,14 @@ static irqreturn_t netxen_msi_intr(int irq, void *data) 
	return IRQ_HANDLED;

}



static irqreturn_t netxen_msix_intr(int irq, void *data)

{

	struct netxen_adapter *adapter = data;



	napi_schedule(&adapter->napi);

	return IRQ_HANDLED;

}



static int netxen_nic_poll(struct napi_struct *napi, int budget)

{

	struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi);