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

Commit 076dab23 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: (28 commits)
  drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held
  ksz884x: Add missing validate_addr hook
  ksz884x: convert to netdev_tx_t
  virtio-net: pass gfp to add_buf
  be2net: convert hdr.timeout in be_cmd_loopback_test() to le32
  can: mpc5xxx_can.c: Fix build failure
  net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1
  net: sock_queue_err_skb() dont mess with sk_forward_alloc
  netfilter: xtables: stackptr should be percpu
  netfilter: don't xt_jumpstack_alloc twice in xt_register_table
  greth: Fix build after OF device conversions.
  net: fix sk_forward_alloc corruptions
  Phonet: listening socket lock protects the connected socket list
  caif: unlock on error path in cfserl_receive()
  be2net: remove superfluous externs
  be2net: add unlock on error path
  net/rds: Add missing mutex_unlock
  drivers/isdn/hardware/mISDN: Add missing spin_unlock
  fs_enet: Adjust BDs after tx error
  skb: make skb_recycle_check() return a bool value
  ...
parents e30c7c3b b42d9165

drivers/isdn/hardware/mISDN/hfcsusb.c

+3 −1
Original line number Diff line number Diff line
@@ -97,8 +97,10 @@ static int write_reg(struct hfcsusb *hw, __u8 reg, __u8 val) 
			hw->name, __func__, reg, val);



	spin_lock(&hw->ctrl_lock);

	if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE)

	if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE) {

		spin_unlock(&hw->ctrl_lock);

		return 1;

	}

	buf = &hw->ctrl_buff[hw->ctrl_in_idx];

	buf->hfcs_reg = reg;

	buf->reg_val = val;

drivers/isdn/hardware/mISDN/netjet.c

+2 −2
Original line number Diff line number Diff line
@@ -320,12 +320,12 @@ inittiger(struct tiger_hw *card) 
		return -ENOMEM;

	}

	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) {

			pr_info("%s: no B%d send buffer\n", card->name, i + 1);

			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) {

			pr_info("%s: no B%d recv buffer\n", card->name, i + 1);

			return -ENOMEM;

drivers/net/benet/be_cmds.c

+8 −5
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, 
	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

		goto err_unlock;

	}

	req = cmd->va;

	sge = nonembedded_sgl(wrb);
@@ -1457,7 +1457,10 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, 
	else

		status = adapter->flash_status;



err:

	return status;



err_unlock:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}
@@ -1497,7 +1500,7 @@ err: 
	return status;

}



extern int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,

int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,

				struct be_dma_mem *nonemb_cmd)

{

	struct be_mcc_wrb *wrb;
@@ -1590,7 +1593,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num, 


	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,

			OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));

	req->hdr.timeout = 4;

	req->hdr.timeout = cpu_to_le32(4);



	req->pattern = cpu_to_le64(pattern);

	req->src_port = cpu_to_le32(port_num);
@@ -1662,7 +1665,7 @@ err: 
	return status;

}



extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,

int be_cmd_get_seeprom_data(struct be_adapter *adapter,

				struct be_dma_mem *nonemb_cmd)

{

	struct be_mcc_wrb *wrb;

drivers/net/can/mscan/mpc5xxx_can.c

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev, 
	else

		*mscan_clksrc = MSCAN_CLKSRC_XTAL;



	freq = mpc5xxx_get_bus_frequency(ofdev->node);

	freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);

	if (!freq)

		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 */

	pval = of_get_property(ofdev->node, "reg", &plen);

	pval = of_get_property(ofdev->dev.of_node, "reg", &plen);

	BUG_ON(!pval || plen < sizeof(*pval));

	clockidx = (*pval & 0x80) ? 1 : 0;

	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")) {

		*mscan_clksrc = MSCAN_CLKSRC_IPS;

		freq = mpc5xxx_get_bus_frequency(ofdev->node);

		freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);

	} else {

		*mscan_clksrc = MSCAN_CLKSRC_BUS;



		pval = of_get_property(ofdev->node,

		pval = of_get_property(ofdev->dev.of_node,

				       "fsl,mscan-clock-divider", &plen);

		if (pval && plen == sizeof(*pval))

			clockdiv = *pval;
@@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev, 
				       const struct of_device_id *id)

{

	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 mscan_priv *priv;

	void __iomem *base;

drivers/net/fs_enet/mac-fcc.c

+43 −6
Original line number Diff line number Diff line
@@ -504,17 +504,54 @@ static int get_regs_len(struct net_device *dev) 
}



/* Some transmit errors cause the transmitter to shut

 * down.  We now issue a restart transmit.  Since the

 * errors close the BD and update the pointers, the restart

 * _should_ pick up without having to reset any of our

 * pointers either.  Also, To workaround 8260 device erratum

 * CPM37, we must disable and then re-enable the transmitter

 * following a Late Collision, Underrun, or Retry Limit error.

 * down.  We now issue a restart transmit.

 * Also, to workaround 8260 device erratum CPM37, we must

 * disable and then re-enable the transmitterfollowing a

 * Late Collision, Underrun, or Retry Limit error.

 * In addition, tbptr may point beyond BDs beyond still marked

 * as ready due to internal pipelining, so we need to look back

 * through the BDs and adjust tbptr to point to the last BD

 * marked as ready.  This may result in some buffers being

 * retransmitted.

 */

static void tx_restart(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t __iomem *fccp = fep->fcc.fccp;

	const struct fs_platform_info *fpi = fep->fpi;

	fcc_enet_t __iomem *ep = fep->fcc.ep;

	cbd_t __iomem *curr_tbptr;

	cbd_t __iomem *recheck_bd;

	cbd_t __iomem *prev_bd;

	cbd_t __iomem *last_tx_bd;



	last_tx_bd = fep->tx_bd_base + (fpi->tx_ring * sizeof(cbd_t));



	/* get the current bd held in TBPTR  and scan back from this point */

	recheck_bd = curr_tbptr = (cbd_t __iomem *)

		((R32(ep, fen_genfcc.fcc_tbptr) - fep->ring_mem_addr) +

		fep->ring_base);



	prev_bd = (recheck_bd == fep->tx_bd_base) ? last_tx_bd : recheck_bd - 1;



	/* Move through the bds in reverse, look for the earliest buffer

	 * that is not ready.  Adjust TBPTR to the following buffer */

	while ((CBDR_SC(prev_bd) & BD_ENET_TX_READY) != 0) {

		/* Go back one buffer */

		recheck_bd = prev_bd;



		/* update the previous buffer */

		prev_bd = (prev_bd == fep->tx_bd_base) ? last_tx_bd : prev_bd - 1;



		/* We should never see all bds marked as ready, check anyway */

		if (recheck_bd == curr_tbptr)

			break;

	}

	/* Now update the TBPTR and dirty flag to the current buffer */

	W32(ep, fen_genfcc.fcc_tbptr,

		(uint) (((void *)recheck_bd - fep->ring_base) +

		fep->ring_mem_addr));

	fep->dirty_tx = recheck_bd;



	C32(fccp, fcc_gfmr, FCC_GFMR_ENT);

	udelay(10);