Commit 25431e90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sunrpc: fix rdma dependencies
  e1000: Fix PCI enable to honor the need_ioport flag
  sgi-xp: link XPNET's net_device_ops to its net_device structure
  pcnet_cs: Fix misuse of the equality operator.
  hso: add new device id's
  dca: redesign locks to fix deadlocks
  cassini/sungem: limit reaches -1, but 0 tested
  net: variables reach -1, but 0 tested
  qlge: bugfix: Add missing netif_napi_del call.
  qlge: bugfix: Add flash offset for second port.
  qlge: bugfix: Fix endian issue when reading flash.
  udp: increments sk_drops in __udp_queue_rcv_skb()
  net: Fix userland breakage wrt. linux/if_tunnel.h
  net: packet socket packet_lookup_frame fix
parents 0d7a063f 55128bc2

drivers/dca/dca-core.c

+33 −18
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/device.h>

#include <linux/dca.h>



#define DCA_VERSION "1.4"

#define DCA_VERSION "1.8"



MODULE_VERSION(DCA_VERSION);

MODULE_LICENSE("GPL");
@@ -60,16 +60,17 @@ int dca_add_requester(struct device *dev) 
{

	struct dca_provider *dca;

	int err, slot = -ENODEV;

	unsigned long flags;



	if (!dev)

		return -EFAULT;



	spin_lock(&dca_lock);

	spin_lock_irqsave(&dca_lock, flags);



	/* check if the requester has not been added already */

	dca = dca_find_provider_by_dev(dev);

	if (dca) {

		spin_unlock(&dca_lock);

		spin_unlock_irqrestore(&dca_lock, flags);

		return -EEXIST;

	}
@@ -78,19 +79,21 @@ int dca_add_requester(struct device *dev) 
		if (slot >= 0)

			break;

	}

	if (slot < 0) {

		spin_unlock(&dca_lock);



	spin_unlock_irqrestore(&dca_lock, flags);



	if (slot < 0)

		return slot;

	}



	err = dca_sysfs_add_req(dca, dev, slot);

	if (err) {

		spin_lock_irqsave(&dca_lock, flags);

		if (dca == dca_find_provider_by_dev(dev))

			dca->ops->remove_requester(dca, dev);

		spin_unlock(&dca_lock);

		spin_unlock_irqrestore(&dca_lock, flags);

		return err;

	}



	spin_unlock(&dca_lock);

	return 0;

}

EXPORT_SYMBOL_GPL(dca_add_requester);
@@ -103,25 +106,25 @@ int dca_remove_requester(struct device *dev) 
{

	struct dca_provider *dca;

	int slot;

	unsigned long flags;



	if (!dev)

		return -EFAULT;



	spin_lock(&dca_lock);

	spin_lock_irqsave(&dca_lock, flags);

	dca = dca_find_provider_by_dev(dev);

	if (!dca) {

		spin_unlock(&dca_lock);

		spin_unlock_irqrestore(&dca_lock, flags);

		return -ENODEV;

	}

	slot = dca->ops->remove_requester(dca, dev);

	if (slot < 0) {

		spin_unlock(&dca_lock);

	spin_unlock_irqrestore(&dca_lock, flags);



	if (slot < 0)

		return slot;

	}



	dca_sysfs_remove_req(dca, slot);



	spin_unlock(&dca_lock);

	return 0;

}

EXPORT_SYMBOL_GPL(dca_remove_requester);
@@ -135,17 +138,18 @@ u8 dca_common_get_tag(struct device *dev, int cpu) 
{

	struct dca_provider *dca;

	u8 tag;

	unsigned long flags;



	spin_lock(&dca_lock);

	spin_lock_irqsave(&dca_lock, flags);



	dca = dca_find_provider_by_dev(dev);

	if (!dca) {

		spin_unlock(&dca_lock);

		spin_unlock_irqrestore(&dca_lock, flags);

		return -ENODEV;

	}

	tag = dca->ops->get_tag(dca, dev, cpu);



	spin_unlock(&dca_lock);

	spin_unlock_irqrestore(&dca_lock, flags);

	return tag;

}
@@ -217,11 +221,16 @@ static BLOCKING_NOTIFIER_HEAD(dca_provider_chain); 
int register_dca_provider(struct dca_provider *dca, struct device *dev)

{

	int err;

	unsigned long flags;



	err = dca_sysfs_add_provider(dca, dev);

	if (err)

		return err;



	spin_lock_irqsave(&dca_lock, flags);

	list_add(&dca->node, &dca_providers);

	spin_unlock_irqrestore(&dca_lock, flags);



	blocking_notifier_call_chain(&dca_provider_chain,

				     DCA_PROVIDER_ADD, NULL);

	return 0;
@@ -234,9 +243,15 @@ EXPORT_SYMBOL_GPL(register_dca_provider); 
 */

void unregister_dca_provider(struct dca_provider *dca)

{

	unsigned long flags;



	blocking_notifier_call_chain(&dca_provider_chain,

				     DCA_PROVIDER_REMOVE, NULL);



	spin_lock_irqsave(&dca_lock, flags);

	list_del(&dca->node);

	spin_unlock_irqrestore(&dca_lock, flags);



	dca_sysfs_remove_provider(dca);

}

EXPORT_SYMBOL_GPL(unregister_dca_provider);

drivers/misc/sgi-xp/xpnet.c

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.

 * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.

 */



/*
@@ -551,6 +551,7 @@ xpnet_init(void) 


	netif_carrier_off(xpnet_device);



	xpnet_device->netdev_ops = &xpnet_netdev_ops;

	xpnet_device->mtu = XPNET_DEF_MTU;



	/*

drivers/net/cassini.c

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int cas_reset_mii_phy(struct cas *cp) 


	cas_phy_write(cp, MII_BMCR, BMCR_RESET);

	udelay(100);

	while (limit--) {

	while (--limit) {

		val = cas_phy_read(cp, MII_BMCR);

		if ((val & BMCR_RESET) == 0)

			break;
@@ -979,7 +979,7 @@ static void cas_phy_init(struct cas *cp) 
		writel(val, cp->regs + REG_PCS_MII_CTRL);



		limit = STOP_TRIES;

		while (limit-- > 0) {

		while (--limit > 0) {

			udelay(10);

			if ((readl(cp->regs + REG_PCS_MII_CTRL) &

			     PCS_MII_RESET) == 0)

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
		err = pci_enable_device(pdev);

	} else {

		bars = pci_select_bars(pdev, IORESOURCE_MEM);

		err = pci_enable_device(pdev);

		err = pci_enable_device_mem(pdev);

	}

	if (err)

		return err;

drivers/net/ibm_newemac/phy.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int emac_mii_reset_phy(struct mii_phy *phy) 


	udelay(300);



	while (limit--) {

	while (--limit) {

		val = phy_read(phy, MII_BMCR);

		if (val >= 0 && (val & BMCR_RESET) == 0)

			break;
@@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy) 


	udelay(300);



	while (limit--) {

	while (--limit) {

		val = gpcs_phy_read(phy, MII_BMCR);

		if (val >= 0 && (val & BMCR_RESET) == 0)

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE