Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (cfadf853) · Commits · e / devices / android_kernel_teracube_2e

drivers/isdn/i4l/isdn_net.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -83,19 +83,19 @@ static __inline__ isdn_net_local * isdn_net_get_locked_lp(isdn_net_dev *nd)

		spin_lock_irqsave(&nd->queue_lock, flags);
		lp = nd->queue; /* get lp on top of queue */
		spin_lock(&nd->queue->xmit_lock);
		while (isdn_net_lp_busy(nd->queue)) {
		spin_unlock(&nd->queue->xmit_lock);
		nd->queue = nd->queue->next;
		if (nd->queue == lp) { /* not found -- should never happen */
		lp = NULL;
		goto errout;
		}
		spin_lock(&nd->queue->xmit_lock);
		}
		lp = nd->queue;
		nd->queue = nd->queue->next;
		spin_unlock_irqrestore(&nd->queue_lock, flags);
		spin_lock(&lp->xmit_lock);
		local_bh_disable();
		return lp;
		errout:
		spin_unlock_irqrestore(&nd->queue_lock, flags);
		return lp;

drivers/net/Kconfig

+4 −1

Original line number	Diff line number	Diff line
		@@ -1741,6 +1741,7 @@ config KS8851
		config KS8851_MLL
		tristate "Micrel KS8851 MLL"
		depends on HAS_IOMEM
		select MII
		help
		This platform driver is for Micrel KS8851 Address/data bus
		multiplexed network chip.
		@@ -2482,6 +2483,8 @@ config S6GMAC
		To compile this driver as a module, choose M here. The module
		will be called s6gmac.

		source "drivers/net/stmmac/Kconfig"

		endif # NETDEV_1000

		#
		@@ -3232,7 +3235,7 @@ config VIRTIO_NET

		config VMXNET3
		tristate "VMware VMXNET3 ethernet driver"
		depends on PCI && X86
		depends on PCI && X86 && INET
		help
		This driver supports VMware's vmxnet3 virtual ethernet NIC.
		To compile this driver as a module, choose M here: the

drivers/net/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
		obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
		obj-$(CONFIG_RIONET) += rionet.o
		obj-$(CONFIG_SH_ETH) += sh_eth.o
		obj-$(CONFIG_STMMAC_ETH) += stmmac/

		#
		# end link order section

drivers/net/au1000_eth.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		*
		*
		*/
		#include <linux/capability.h>
		#include <linux/dma-mapping.h>
		#include <linux/module.h>
		#include <linux/kernel.h>

drivers/net/benet/be_cmds.c

+22 −11

Original line number	Diff line number	Diff line
		@@ -243,15 +243,26 @@ static int be_POST_stage_get(struct be_adapter adapter, u16 stage)

		int be_cmd_POST(struct be_adapter *adapter)
		{
		u16 stage, error;
		u16 stage;
		int status, timeout = 0;

		error = be_POST_stage_get(adapter, &stage);
		if (error \|\| stage != POST_STAGE_ARMFW_RDY) {
		dev_err(&adapter->pdev->dev, "POST failed.\n");
		do {
		status = be_POST_stage_get(adapter, &stage);
		if (status) {
		dev_err(&adapter->pdev->dev, "POST error; stage=0x%x\n",
		stage);
		return -1;
		} else if (stage != POST_STAGE_ARMFW_RDY) {
		set_current_state(TASK_INTERRUPTIBLE);
		schedule_timeout(2 * HZ);
		timeout += 2;
		} else {
		return 0;
		}
		} while (timeout < 20);

		return 0;
		dev_err(&adapter->pdev->dev, "POST timeout; stage=0x%x\n", stage);
		return -1;
		}

		static inline void embedded_payload(struct be_mcc_wrb wrb)
		@@ -729,8 +740,8 @@ int be_cmd_q_destroy(struct be_adapter adapter, struct be_queue_info q,
		/* Create an rx filtering policy configuration on an i/f
		* Uses mbox
		*/
		int be_cmd_if_create(struct be_adapter adapter, u32 flags, u8 mac,
		bool pmac_invalid, u32 if_handle, u32 pmac_id)
		int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
		u8 mac, bool pmac_invalid, u32 if_handle, u32 *pmac_id)
		{
		struct be_mcc_wrb *wrb;
		struct be_cmd_req_if_create *req;
		@@ -746,8 +757,8 @@ int be_cmd_if_create(struct be_adapter adapter, u32 flags, u8 mac,
		be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
		OPCODE_COMMON_NTWK_INTERFACE_CREATE, sizeof(*req));

		req->capability_flags = cpu_to_le32(flags);
		req->enable_flags = cpu_to_le32(flags);
		req->capability_flags = cpu_to_le32(cap_flags);
		req->enable_flags = cpu_to_le32(en_flags);
		req->pmac_invalid = pmac_invalid;
		if (!pmac_invalid)
		memcpy(req->mac_addr, mac, ETH_ALEN);