summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-03 00:50:27 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-08 18:23:54 -0700
commit369d49a955f325dcc9aa64e97999ab5e22dcf845 (patch)
tree1aff17dba883e5c536173b9cea0d6a9fc4812d69 /patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
parentcea2d7e7933f0ec8dd411e34af22ebd6bd24436e (diff)
backports: refresh patches for v3.14v3.14-1
mcgrof@drvbp1 ~/backports (git::linux-3.14.y)$ time \ ./gentree.py --clean --verbose --refresh /home/mcgrof/linux /home/mcgrof/build/linux-3.14/ real 1m32.443s user 23m35.088s sys 0m29.280s $ time ckmake --allyesconfig 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.79 [ 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.29 [ OK ] 27 3.11.10 [ OK ] 28 3.12.10 [ OK ] 29 3.13.2 [ OK ] 30 3.14-rc1 [ OK ] real 39m53.331s user 1090m4.292s sys 147m15.968s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch')
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch6
1 files changed, 3 insertions, 3 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 e5e7c75f..cdf759f8 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
-@@ -733,8 +733,13 @@ static int l2cap_sock_setsockopt_old(str
+@@ -726,8 +726,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;
-@@ -1527,8 +1532,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1524,8 +1529,12 @@ static struct sock *l2cap_sock_alloc(str
return sk;
}
@@ -27,7 +27,7 @@
{
struct sock *sk;
-@@ -1540,7 +1549,11 @@ static int l2cap_sock_create(struct net
+@@ -1537,7 +1546,11 @@ static int l2cap_sock_create(struct net
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;