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

Commit 083dd8b8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 95b8fbad a14b289d

drivers/bluetooth/btusb.c

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Apple MacBookAir3,1, MacBookAir3,2 */

	{ USB_DEVICE(0x05ac, 0x821b) },



	/* Apple MacBookPro8,2 */

	{ USB_DEVICE(0x05ac, 0x821a) },



	/* AVM BlueFRITZ! USB v2.0 */

	{ USB_DEVICE(0x057c, 0x3800) },
@@ -690,7 +693,8 @@ static int btusb_send_frame(struct sk_buff *skb) 
		break;



	case HCI_ACLDATA_PKT:

		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)

		if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 &&

						hdev->conn_hash.le_num < 1))

			return -ENODEV;



		urb = usb_alloc_urb(0, GFP_ATOMIC);

drivers/net/bonding/bond_alb.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct tlb_client_info { 
				 * packets to a Client that the Hash function

				 * gave this entry index.

				 */

	u32 tx_bytes;		/* Each Client acumulates the BytesTx that

	u32 tx_bytes;		/* Each Client accumulates the BytesTx that

				 * were tranmitted to it, and after each

				 * CallBack the LoadHistory is devided

				 * by the balance interval

drivers/net/mlx4/eq.c

+3 −1
Original line number Diff line number Diff line
@@ -603,7 +603,9 @@ int mlx4_init_eq_table(struct mlx4_dev *dev) 
	}



	for (i = 0; i < dev->caps.num_comp_vectors; ++i) {

		err = mlx4_create_eq(dev, dev->caps.num_cqs + MLX4_NUM_SPARE_EQE,

		err = mlx4_create_eq(dev, dev->caps.num_cqs -

					  dev->caps.reserved_cqs +

					  MLX4_NUM_SPARE_EQE,

				     (dev->flags & MLX4_FLAG_MSI_X) ? i : 0,

				     &priv->eq_table.eq[i]);

		if (err) {

drivers/net/mlx4/mcg.c

+4 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port, 
	u32 members_count;

	struct mlx4_steer_index *new_entry;

	struct mlx4_promisc_qp *pqp;

	struct mlx4_promisc_qp *dqp;

	struct mlx4_promisc_qp *dqp = NULL;

	u32 prot;

	int err;

	u8 pf_num;
@@ -184,7 +184,7 @@ out_mailbox: 
out_alloc:

	if (dqp) {

		list_del(&dqp->list);

		kfree(&dqp);

		kfree(dqp);

	}

	list_del(&new_entry->list);

	kfree(new_entry);
@@ -469,7 +469,6 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port, 


	/*remove from list of promisc qps */

	list_del(&pqp->list);

	kfree(pqp);



	/* set the default entry not to include the removed one */

	mailbox = mlx4_alloc_cmd_mailbox(dev);
@@ -528,6 +527,8 @@ out_mailbox: 
out_list:

	if (back_to_list)

		list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]);

	else

		kfree(pqp);

out_mutex:

	mutex_unlock(&priv->mcg_table.mutex);

	return err;

drivers/net/starfire.c

+1 −5
Original line number Diff line number Diff line
@@ -144,11 +144,7 @@ static int full_duplex[MAX_UNITS] = {0, }; 
/* Time in jiffies before concluding the transmitter is hung. */

#define TX_TIMEOUT	(2 * HZ)



/*

 * This SUCKS.

 * We need a much better method to determine if dma_addr_t is 64-bit.

 */

#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || (defined(CONFIG_MIPS) && ((defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || defined(CONFIG_64BIT))) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT))

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

/* 64-bit dma_addr_t */

#define ADDR_64BITS	/* This chip uses 64 bit addresses. */

#define netdrv_addr_t __le64