Commit a0aff75e authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'for-net-2025-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - hci_event: Fix connection regression between LE and non-LE adapters
 - Fix error code in chan_alloc_skb_cb()

* tag 'for-net-2025-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
  Bluetooth: hci_event: Fix connection regression between LE and non-LE adapters
  Bluetooth: Fix error code in chan_alloc_skb_cb()
====================

Link: https://patch.msgid.link/20250314163847.110069-1-luiz.dentz@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents c9cb135b f6685a96

include/net/bluetooth/hci.h

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ enum { 
#define HCI_ERROR_REMOTE_POWER_OFF	0x15

#define HCI_ERROR_LOCAL_HOST_TERM	0x16

#define HCI_ERROR_PAIRING_NOT_ALLOWED	0x18

#define HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE	0x1e

#define HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE	0x1a

#define HCI_ERROR_INVALID_LL_PARAMS	0x1e

#define HCI_ERROR_UNSPECIFIED		0x1f

#define HCI_ERROR_ADVERTISING_TIMEOUT	0x3c

net/bluetooth/6lowpan.c

+6 −1
Original line number Diff line number Diff line
@@ -825,11 +825,16 @@ static struct sk_buff *chan_alloc_skb_cb(struct l2cap_chan *chan, 
					 unsigned long hdr_len,

					 unsigned long len, int nb)

{

	struct sk_buff *skb;



	/* Note that we must allocate using GFP_ATOMIC here as

	 * this function is called originally from netdev hard xmit

	 * function in atomic context.

	 */

	return bt_skb_alloc(hdr_len + len, GFP_ATOMIC);

	skb = bt_skb_alloc(hdr_len + len, GFP_ATOMIC);

	if (!skb)

		return ERR_PTR(-ENOMEM);

	return skb;

}



static void chan_suspend_cb(struct l2cap_chan *chan)