diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
commit | 30498b130cc0476e73f5142dcc63bc271da2d89b (patch) | |
tree | 4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch | |
parent | a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff) |
refresh patches against next-20130328
The patches were last refreshed against that same tree,
so the only change is that now we have -p in there, which
results in changes like this (only):
-@@ -1593,7 +1593,7 @@
+@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
This makes the patches more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch')
-rw-r--r-- | patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 019bf549..8607e2ea 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c -@@ -103,8 +103,12 @@ +@@ -103,8 +103,12 @@ void bt_sock_unregister(int proto) } EXPORT_SYMBOL(bt_sock_unregister); @@ -13,7 +13,7 @@ { int err; -@@ -122,7 +126,11 @@ +@@ -122,7 +126,11 @@ static int bt_sock_create(struct net *ne read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { @@ -25,7 +25,7 @@ if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -455,7 +463,11 @@ +@@ -455,7 +463,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; |