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

drivers/isdn/capi/kcapi.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1020,12 +1020,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
	if (cmd == AVMB1_ADDCARD) {		if (cmd == AVMB1_ADDCARD) {
	if ((retval = copy_from_user(&cdef, data,		if ((retval = copy_from_user(&cdef, data,
	sizeof(avmb1_carddef))))		sizeof(avmb1_carddef))))
	return retval;		return -EFAULT;
	cdef.cardtype = AVM_CARDTYPE_B1;		cdef.cardtype = AVM_CARDTYPE_B1;
	} else {		} else {
	if ((retval = copy_from_user(&cdef, data,		if ((retval = copy_from_user(&cdef, data,
	sizeof(avmb1_extcarddef))))		sizeof(avmb1_extcarddef))))
	return retval;		return -EFAULT;
	}		}
	cparams.port = cdef.port;		cparams.port = cdef.port;
	cparams.irq = cdef.irq;		cparams.irq = cdef.irq;
	@@ -1218,7 +1218,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
	kcapi_carddef cdef;		kcapi_carddef cdef;

	if ((retval = copy_from_user(&cdef, data, sizeof(cdef))))		if ((retval = copy_from_user(&cdef, data, sizeof(cdef))))
	return retval;		return -EFAULT;

	cparams.port = cdef.port;		cparams.port = cdef.port;
	cparams.irq = cdef.irq;		cparams.irq = cdef.irq;

drivers/isdn/hardware/mISDN/netjet.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -320,12 +320,12 @@ inittiger(struct tiger_hw *card)
	return -ENOMEM;		return -ENOMEM;
	}		}
	for (i = 0; i < 2; i++) {		for (i = 0; i < 2; i++) {
	card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_KERNEL);		card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_ATOMIC);
	if (!card->bc[i].hsbuf) {		if (!card->bc[i].hsbuf) {
	pr_info("%s: no B%d send buffer\n", card->name, i + 1);		pr_info("%s: no B%d send buffer\n", card->name, i + 1);
	return -ENOMEM;		return -ENOMEM;
	}		}
	card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_KERNEL);		card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_ATOMIC);
	if (!card->bc[i].hrbuf) {		if (!card->bc[i].hrbuf) {
	pr_info("%s: no B%d recv buffer\n", card->name, i + 1);		pr_info("%s: no B%d recv buffer\n", card->name, i + 1);
	return -ENOMEM;		return -ENOMEM;

drivers/net/benet/be_cmds.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1592,7 +1592,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,

	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,		be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
	OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));		OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));
	req->hdr.timeout = 4;		req->hdr.timeout = cpu_to_le32(4);

	req->pattern = cpu_to_le64(pattern);		req->pattern = cpu_to_le64(pattern);
	req->src_port = cpu_to_le32(port_num);		req->src_port = cpu_to_le32(port_num);

drivers/net/bnx2.c

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -247,6 +247,7 @@ static const struct flash_spec flash_5709 = {
	MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);		MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);

	static void bnx2_init_napi(struct bnx2 *bp);		static void bnx2_init_napi(struct bnx2 *bp);
			static void bnx2_del_napi(struct bnx2 *bp);

	static inline u32 bnx2_tx_avail(struct bnx2 bp, struct bnx2_tx_ring_info txr)		static inline u32 bnx2_tx_avail(struct bnx2 bp, struct bnx2_tx_ring_info txr)
	{		{
	@@ -6270,6 +6271,7 @@ bnx2_open(struct net_device *dev)
	bnx2_free_skbs(bp);		bnx2_free_skbs(bp);
	bnx2_free_irq(bp);		bnx2_free_irq(bp);
	bnx2_free_mem(bp);		bnx2_free_mem(bp);
			bnx2_del_napi(bp);
	return rc;		return rc;
	}		}

	@@ -6537,6 +6539,7 @@ bnx2_close(struct net_device *dev)
	bnx2_free_irq(bp);		bnx2_free_irq(bp);
	bnx2_free_skbs(bp);		bnx2_free_skbs(bp);
	bnx2_free_mem(bp);		bnx2_free_mem(bp);
			bnx2_del_napi(bp);
	bp->link_up = 0;		bp->link_up = 0;
	netif_carrier_off(bp->dev);		netif_carrier_off(bp->dev);
	bnx2_set_power_state(bp, PCI_D3hot);		bnx2_set_power_state(bp, PCI_D3hot);
	@@ -8227,7 +8230,16 @@ bnx2_bus_string(struct bnx2 bp, char str)
	return str;		return str;
	}		}

	static void __devinit		static void
			bnx2_del_napi(struct bnx2 *bp)
			{
			int i;

			for (i = 0; i < bp->irq_nvecs; i++)
			netif_napi_del(&bp->bnx2_napi[i].napi);
			}

			static void
	bnx2_init_napi(struct bnx2 *bp)		bnx2_init_napi(struct bnx2 *bp)
	{		{
	int i;		int i;

drivers/net/can/mscan/mpc5xxx_can.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
	else		else
	*mscan_clksrc = MSCAN_CLKSRC_XTAL;		*mscan_clksrc = MSCAN_CLKSRC_XTAL;

	freq = mpc5xxx_get_bus_frequency(ofdev->node);		freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
	if (!freq)		if (!freq)
	return 0;		return 0;

	@@ -152,7 +152,7 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
	}		}

	/* Determine the MSCAN device index from the physical address */		/* Determine the MSCAN device index from the physical address */
	pval = of_get_property(ofdev->node, "reg", &plen);		pval = of_get_property(ofdev->dev.of_node, "reg", &plen);
	BUG_ON(!pval \|\| plen < sizeof(*pval));		BUG_ON(!pval \|\| plen < sizeof(*pval));
	clockidx = (*pval & 0x80) ? 1 : 0;		clockidx = (*pval & 0x80) ? 1 : 0;
	if (*pval & 0x2000)		if (*pval & 0x2000)
	@@ -168,11 +168,11 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
	*/		*/
	if (clock_name && !strcmp(clock_name, "ip")) {		if (clock_name && !strcmp(clock_name, "ip")) {
	*mscan_clksrc = MSCAN_CLKSRC_IPS;		*mscan_clksrc = MSCAN_CLKSRC_IPS;
	freq = mpc5xxx_get_bus_frequency(ofdev->node);		freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
	} else {		} else {
	*mscan_clksrc = MSCAN_CLKSRC_BUS;		*mscan_clksrc = MSCAN_CLKSRC_BUS;

	pval = of_get_property(ofdev->node,		pval = of_get_property(ofdev->dev.of_node,
	"fsl,mscan-clock-divider", &plen);		"fsl,mscan-clock-divider", &plen);
	if (pval && plen == sizeof(*pval))		if (pval && plen == sizeof(*pval))
	clockdiv = *pval;		clockdiv = *pval;
	@@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
	const struct of_device_id *id)		const struct of_device_id *id)
	{		{
	struct mpc5xxx_can_data data = (struct mpc5xxx_can_data )id->data;		struct mpc5xxx_can_data data = (struct mpc5xxx_can_data )id->data;
	struct device_node *np = ofdev->node;		struct device_node *np = ofdev->dev.of_node;
	struct net_device *dev;		struct net_device *dev;
	struct mscan_priv *priv;		struct mscan_priv *priv;
	void __iomem *base;		void __iomem *base;