| --- a/net/bluetooth/rfcomm/sock.c |
| +++ b/net/bluetooth/rfcomm/sock.c |
| @@ -310,8 +310,13 @@ static struct sock *rfcomm_sock_alloc(st |
| return sk; |
| } |
| |
| +#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) |
| static int rfcomm_sock_create(struct net *net, struct socket *sock, |
| int protocol, int kern) |
| +#else |
| +static int rfcomm_sock_create(struct net *net, struct socket *sock, |
| + int protocol) |
| +#endif |
| { |
| struct sock *sk; |
| |
| @@ -681,7 +686,11 @@ static int rfcomm_sock_setsockopt_old(st |
| return err; |
| } |
| |
| +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) |
| static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) |
| +#else |
| +static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen) |
| +#endif |
| { |
| struct sock *sk = sock->sk; |
| struct bt_security sec; |
