Commit d14f5b81 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: (27 commits)
  ipv6: Don't pass invalid dst_entry pointer to dst_release().
  mlx4: fix kfree on error path in new_steering_entry()
  tcp: len check is unnecessarily devastating, change to WARN_ON
  sctp: malloc enough room for asconf-ack chunk
  sctp: fix auth_hmacs field's length of struct sctp_cookie
  net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM
  usbnet: use eth%d name for known ethernet devices
  starfire: clean up dma_addr_t size test
  iwlegacy: fix bugs in change_interface
  carl9170: Fix tx aggregation problems with some clients
  iwl3945: disable hw scan by default
  wireless: rt2x00: rt2800usb.c add and identify ids
  iwl3945: do not deprecate software scan
  mac80211: fix aggregation frame release during timeout
  cfg80211: fix BSS double-unlinking (continued)
  cfg80211:: fix possible NULL pointer dereference
  mac80211: fix possible NULL pointer dereference
  mac80211: fix NULL pointer dereference in ieee80211_key_alloc()
  ath9k: fix a chip wakeup related crash in ath9k_start
  mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS rates
  ...
parents b2a8b4b8 738faca3

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/mlx4/mcg.c

+2 −2
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);

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

drivers/net/usb/cdc_eem.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ next: 


static const struct driver_info eem_info = {

	.description =	"CDC EEM Device",

	.flags =	FLAG_ETHER,

	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT,

	.bind =		eem_bind,

	.rx_fixup =	eem_rx_fixup,

	.tx_fixup =	eem_tx_fixup,

drivers/net/usb/cdc_ether.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int cdc_manage_power(struct usbnet *dev, int on) 


static const struct driver_info	cdc_info = {

	.description =	"CDC Ethernet Device",

	.flags =	FLAG_ETHER,

	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT,

	// .check_connect = cdc_check_connect,

	.bind =		usbnet_cdc_bind,

	.unbind =	usbnet_cdc_unbind,

CRA Git | Maintained and supported by SUSTech CRA and CCSE