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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John Linville says:

Here are three more fixes that some of my developers are desperate to
see included in 3.4...

Johan Hedberg went to some length justifyng the inclusion of these two
Bluetooth fixes:

"The device_connected fix should be quite self-explanatory, but it's
actually a wider issue than just for keyboards. All profiles that do
incoming connection authorization (e.g. headsets) will break without it
with specific hardware. The reason it wasn't caught earlier is that it
only occurs with specific Bluetooth adapters.

As for the security level patch, this fixes L2CAP socket based security
level elevation during a connection. The HID profile needs this (for
keyboards) and it is the only way to achieve the security level
elevation when using the management interface to talk to the kernel
(hence the management enabling patch being the one that exposes this"

The rtlwifi fix addresses a regression related to firmware loading,
as described in kernel.org bug 43187.  It basically just moves a hunk
of code to a more appropriate place.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ab77bf2 60374631

drivers/net/wireless/rtlwifi/pci.c

+8 −8
Original line number Diff line number Diff line
@@ -1851,14 +1851,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, 
	/*like read eeprom and so on */

	rtlpriv->cfg->ops->read_eeprom_info(hw);



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}



	rtlpriv->cfg->ops->init_sw_leds(hw);



	/*aspm */

	rtl_pci_init_aspm(hw);
@@ -1877,6 +1869,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, 
		goto fail3;

	}



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}



	rtlpriv->cfg->ops->init_sw_leds(hw);



	err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

drivers/net/wireless/rtlwifi/usb.c

+5 −5
Original line number Diff line number Diff line
@@ -971,11 +971,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, 
	rtlpriv->cfg->ops->read_chip_version(hw);

	/*like read eeprom and so on */

	rtlpriv->cfg->ops->read_eeprom_info(hw);

	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		goto error_out;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);

	err = _rtl_usb_init(hw);

	if (err)

		goto error_out;
@@ -987,6 +982,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, 
			 "Can't allocate sw for mac80211\n");

		goto error_out;

	}

	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		goto error_out;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);



	return 0;

error_out:

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ struct bt_sock { 
	struct list_head accept_q;

	struct sock *parent;

	u32 defer_setup;

	bool suspended;

};



struct bt_sock_list {

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock, poll_table *wa 
			sk->sk_state == BT_CONFIG)

		return mask;



	if (sock_writeable(sk))

	if (!bt_sk(sk)->suspended && sock_writeable(sk))

		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;

	else

		set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);

net/bluetooth/hci_core.c

+8 −0
Original line number Diff line number Diff line
@@ -2784,6 +2784,14 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 
	if (conn) {

		hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);



		hci_dev_lock(hdev);

		if (test_bit(HCI_MGMT, &hdev->dev_flags) &&

		    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

			mgmt_device_connected(hdev, &conn->dst, conn->type,

					      conn->dst_type, 0, NULL, 0,

					      conn->dev_class);

		hci_dev_unlock(hdev);



		/* Send to upper protocol */

		l2cap_recv_acldata(conn, skb, flags);

		return;