diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2013-03-31 23:12:42 +0200 |
---|---|---|
committer | Johannes Berg <johannes@sipsolutions.net> | 2013-03-31 23:12:42 +0200 |
commit | cf2b28bd1642305515171f6d70b9f033c4e064e5 (patch) | |
tree | c8dd3ece975ea57d009ff08be3cb9d63bf46f6a5 /patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch | |
parent | 445920189178de0b338fc5fa6f3d52035f58c778 (diff) |
rename patch files to .patch
They can be named after the C files they apply to,
but they should still be named .patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch')
-rw-r--r-- | patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch new file mode 100644 index 00000000..87a98121 --- /dev/null +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -0,0 +1,29 @@ +--- a/net/bluetooth/hci_sock.c ++++ b/net/bluetooth/hci_sock.c +@@ -884,8 +884,13 @@ + goto done; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static int hci_sock_setsockopt(struct socket *sock, int level, int optname, + char __user *optval, unsigned int len) ++#else ++static int hci_sock_setsockopt(struct socket *sock, int level, int optname, ++ char __user *optval, int len) ++#endif + { + struct hci_ufilter uf = { .opcode = 0 }; + struct sock *sk = sock->sk; +@@ -1059,8 +1064,12 @@ + .obj_size = sizeof(struct hci_pinfo) + }; + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int hci_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int hci_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + |