diff options
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 8a20aaf1f231..4b5968dda673 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -323,7 +323,8 @@ static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int | |||
323 | return sk; | 323 | return sk; |
324 | } | 324 | } |
325 | 325 | ||
326 | static int rfcomm_sock_create(struct net *net, struct socket *sock, int protocol) | 326 | static int rfcomm_sock_create(struct net *net, struct socket *sock, |
327 | int protocol, int kern) | ||
327 | { | 328 | { |
328 | struct sock *sk; | 329 | struct sock *sk; |
329 | 330 | ||
@@ -703,7 +704,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
703 | copied += chunk; | 704 | copied += chunk; |
704 | size -= chunk; | 705 | size -= chunk; |
705 | 706 | ||
706 | sock_recv_timestamp(msg, sk, skb); | 707 | sock_recv_ts_and_drops(msg, sk, skb); |
707 | 708 | ||
708 | if (!(flags & MSG_PEEK)) { | 709 | if (!(flags & MSG_PEEK)) { |
709 | atomic_sub(chunk, &sk->sk_rmem_alloc); | 710 | atomic_sub(chunk, &sk->sk_rmem_alloc); |
@@ -1101,7 +1102,7 @@ static const struct proto_ops rfcomm_sock_ops = { | |||
1101 | .mmap = sock_no_mmap | 1102 | .mmap = sock_no_mmap |
1102 | }; | 1103 | }; |
1103 | 1104 | ||
1104 | static struct net_proto_family rfcomm_sock_family_ops = { | 1105 | static const struct net_proto_family rfcomm_sock_family_ops = { |
1105 | .family = PF_BLUETOOTH, | 1106 | .family = PF_BLUETOOTH, |
1106 | .owner = THIS_MODULE, | 1107 | .owner = THIS_MODULE, |
1107 | .create = rfcomm_sock_create | 1108 | .create = rfcomm_sock_create |