Commit 0f43dd54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (42 commits)
  netpoll: fix incorrect access to skb data in __netpoll_rx
  cassini: init before use in cas_interruptN.
  can: ti_hecc: Fix uninitialized spinlock in probe
  can: ti_hecc: Fix unintialized variable
  net: sh_eth: fix the compile error
  net/phy: fix DP83865 phy interrupt handler
  sendmmsg/sendmsg: fix unsafe user pointer access
  ibmveth: Fix leak when recycling skb and hypervisor returns error
  arp: fix rcu lockdep splat in arp_process()
  bridge: fix a possible use after free
  bridge: Pseudo-header required for the checksum of ICMPv6
  mcast: Fix source address selection for multicast listener report
  MAINTAINERS: Update GIT trees for network development
  ath9k: Fix PS wrappers in ath9k_set_coverage_class
  carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock
  wl12xx: add max_sched_scan_ssids value to the hw description
  wl12xx: Fix validation of pm_runtime_get_sync return value
  wl12xx: Remove obsolete testmode NVS push command
  bcma: add uevent to the bus, to autoload drivers
  ath9k_hw: Fix STA (AR9485) bringup issue due to incorrect MAC address
  ...
parents 2cd6c7f7 e9278a47

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4450,8 +4450,8 @@ M: "David S. Miller" <davem@davemloft.net> 
L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net

W:	http://patchwork.ozlabs.org/project/netdev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

S:	Maintained

F:	net/

F:	include/net/

drivers/bcma/main.c

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ MODULE_LICENSE("GPL"); 
static int bcma_bus_match(struct device *dev, struct device_driver *drv);

static int bcma_device_probe(struct device *dev);

static int bcma_device_remove(struct device *dev);

static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env);



static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -49,6 +50,7 @@ static struct bus_type bcma_bus_type = { 
	.match		= bcma_bus_match,

	.probe		= bcma_device_probe,

	.remove		= bcma_device_remove,

	.uevent		= bcma_device_uevent,

	.dev_attrs	= bcma_device_attrs,

};
@@ -227,6 +229,16 @@ static int bcma_device_remove(struct device *dev) 
	return 0;

}



static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct bcma_device *core = container_of(dev, struct bcma_device, dev);



	return add_uevent_var(env,

			      "MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X",

			      core->id.manuf, core->id.id,

			      core->id.rev, core->id.class);

}



static int __init bcma_modinit(void)

{

	int err;

drivers/bluetooth/ath3k.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = { 
	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },

	{ USB_DEVICE(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

+10 −3
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
@@ -256,7 +257,9 @@ static void btusb_intr_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -341,7 +344,9 @@ static void btusb_bulk_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -431,7 +436,9 @@ static void btusb_isoc_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

		/* -EPERM: urb is being killed;

		 * -ENODEV: device got disconnected */

		if (err != -EPERM && err != -ENODEV)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

drivers/net/can/ti_hecc.c

+2 −1
Original line number Diff line number Diff line
@@ -503,9 +503,9 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev) 
	spin_unlock_irqrestore(&priv->mbx_lock, flags);



	/* Prepare mailbox for transmission */

	data = cf->can_dlc | (get_tx_head_prio(priv) << 8);

	if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */

		data |= HECC_CANMCF_RTR;

	data |= get_tx_head_prio(priv) << 8;

	hecc_write_mbx(priv, mbxno, HECC_CANMCF, data);



	if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */
@@ -923,6 +923,7 @@ static int ti_hecc_probe(struct platform_device *pdev) 
	priv->can.do_get_state = ti_hecc_get_state;

	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;



	spin_lock_init(&priv->mbx_lock);

	ndev->irq = irq->start;

	ndev->flags |= IFF_ECHO;

	platform_set_drvdata(pdev, ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE