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

Commit 292be57e 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:
  bnx2: Fix bnx2_netif_stop() merge error.
  gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC
  gianfar: Fix stats support
  gianfar: Fix a filer bug
  bnx2: fixing a timout error due not refreshing TX timers correctly
  can/at91: don't check platform_get_irq's return value against zero
  mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion
  bnx2: reset_task is crashing the kernel. Fixing it.
  ipv6: fix an oops when force unload ipv6 module
  TI DaVinci EMAC: Fix MDIO bus frequency configuration
  e100: Fix broken cbs accounting due to missing memset.
  broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()
  e1000e: LED settings in EEPROM ignored on 82571 and 82572
  netxen: use module parameter correctly
  netns: fix net.ipv6.route.gc_min_interval_ms in netns
  Bluetooth: Prevent ill-timed autosuspend in USB driver
  Bluetooth: Fix L2CAP locking scheme regression
  Bluetooth: Ack L2CAP I-frames before retransmit missing packet
  Bluetooth: Fix unset of RemoteBusy flag for L2CAP
  Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()
parents 1814f2da b7466560

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static void btusb_bulk_complete(struct urb *urb) 
		return;



	usb_anchor_urb(urb, &data->bulk_anchor);

	usb_mark_last_busy(data->udev);



	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

drivers/isdn/mISDN/l1oip_core.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ l1oip_socket_thread(void *data) 
	size_t recvbuf_size = 1500;

	int recvlen;

	struct socket *socket = NULL;

	DECLARE_COMPLETION(wait);

	DECLARE_COMPLETION_ONSTACK(wait);



	/* allocate buffer memory */

	recvbuf = kmalloc(recvbuf_size, GFP_KERNEL);

drivers/net/bnx2.c

+10 −2
Original line number Diff line number Diff line
@@ -653,12 +653,20 @@ static void 
bnx2_netif_stop(struct bnx2 *bp)

{

	bnx2_cnic_stop(bp);

	bnx2_disable_int_sync(bp);

	if (netif_running(bp->dev)) {

		int i;



		bnx2_napi_disable(bp);

		netif_tx_disable(bp->dev);

		bp->dev->trans_start = jiffies;	/* prevent tx timeout */

		/* prevent tx timeout */

		for (i = 0; i <  bp->dev->num_tx_queues; i++) {

			struct netdev_queue *txq;



			txq = netdev_get_tx_queue(bp->dev, i);

			txq->trans_start = jiffies;

		}

	}

	bnx2_disable_int_sync(bp);

}



static void

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int __init at91_can_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_irq(pdev, 0);

	if (!res || !irq) {

	if (!res || irq <= 0) {

		err = -ENODEV;

		goto exit_put;

	}

drivers/net/davinci_emac.c

+1 −1
Original line number Diff line number Diff line
@@ -2272,7 +2272,7 @@ static int emac_mii_reset(struct mii_bus *bus) 
	unsigned int clk_div;

	int mdio_bus_freq = emac_bus_frequency;



	if (mdio_max_freq & mdio_bus_freq)

	if (mdio_max_freq && mdio_bus_freq)

		clk_div = ((mdio_bus_freq / mdio_max_freq) - 1);

	else

		clk_div = 0xFF;