summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-31 17:22:11 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-02-01 00:31:30 +0100
commit9371178a22259a8685a86aa7bcfdb1376a1b31ca (patch)
tree8b0cd075bbaa0d52a8772daf2f5cbfe9c9dc083d
parent54df5c5ede1d8970f15f9713222c2264717f9e13 (diff)
backports: refresh on next-20140131backports-20140131
1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.101 [ OK ] 17 3.1.10 [ OK ] 18 3.2.54 [ OK ] 19 3.3.8 [ OK ] 20 3.4.77 [ OK ] 21 3.5.7 [ OK ] 22 3.6.11 [ OK ] 23 3.7.10 [ OK ] 24 3.8.13 [ OK ] 25 3.9.11 [ OK ] 26 3.10.27 [ OK ] 27 3.11.10 [ OK ] 28 3.12.8 [ OK ] 29 3.13-rc8 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch6
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
index d0959dbf..2bd33d2a 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -736,8 +736,13 @@ static int l2cap_sock_setsockopt_old(str
+@@ -749,8 +749,13 @@ static int l2cap_sock_setsockopt_old(str
return err;
}
@@ -14,7 +14,7 @@
{
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1534,8 +1539,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1553,8 +1558,12 @@ static struct sock *l2cap_sock_alloc(str
return sk;
}
@@ -27,7 +27,7 @@
{
struct sock *sk;
-@@ -1547,7 +1556,11 @@ static int l2cap_sock_create(struct net
+@@ -1566,7 +1575,11 @@ static int l2cap_sock_create(struct net
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
index 0ecfca3e..bbb4cf9a 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
@@ -14,7 +14,7 @@
{
struct sock *sk;
-@@ -672,7 +677,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -675,7 +680,11 @@ static int rfcomm_sock_setsockopt_old(st
return err;
}