From d55b49a73c6e4fa4001174eb16a52ba937b1b19e Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 29 May 2012 13:24:19 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20120529 Signed-off-by: Luis R. Rodriguez --- patches/16-bluetooth.patch | 4 ++-- patches/46-use_other_workqueue.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index a4918857eb6c..aba06ea606f5 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -549,7 +549,7 @@ here still, but for now we keep this here. { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1078,8 +1085,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1166,8 +1173,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -562,7 +562,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -1091,7 +1102,11 @@ static int l2cap_sock_create(struct net +@@ -1179,7 +1190,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch index 44380511f0b1..799cc162b20b 100644 --- a/patches/46-use_other_workqueue.patch +++ b/patches/46-use_other_workqueue.patch @@ -4,8 +4,8 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -1722,8 +1722,12 @@ int hci_register_dev(struct hci_dev *hde - +@@ -1724,8 +1724,12 @@ int hci_register_dev(struct hci_dev *hde + list_add(&hdev->list, &hci_dev_list); write_unlock(&hci_dev_list_lock); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -- 2.30.2