hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/net/bluetooth/af_bluetooth.c
....@@ -173,7 +173,7 @@
173173 else
174174 release_sock(sk);
175175
176
- parent->sk_ack_backlog++;
176
+ sk_acceptq_added(parent);
177177 }
178178 EXPORT_SYMBOL(bt_accept_enqueue);
179179
....@@ -185,7 +185,7 @@
185185 BT_DBG("sk %p state %d", sk, sk->sk_state);
186186
187187 list_del_init(&bt_sk(sk)->accept_q);
188
- bt_sk(sk)->parent->sk_ack_backlog--;
188
+ sk_acceptq_removed(bt_sk(sk)->parent);
189189 bt_sk(sk)->parent = NULL;
190190 sock_put(sk);
191191 }
....@@ -286,6 +286,9 @@
286286 if (msg->msg_name && bt_sk(sk)->skb_msg_name)
287287 bt_sk(sk)->skb_msg_name(skb, msg->msg_name,
288288 &msg->msg_namelen);
289
+
290
+ if (bt_sk(sk)->skb_put_cmsg)
291
+ bt_sk(sk)->skb_put_cmsg(skb, msg, sk);
289292 }
290293
291294 skb_free_datagram(sk, skb);
....@@ -453,8 +456,6 @@
453456 struct sock *sk = sock->sk;
454457 __poll_t mask = 0;
455458
456
- BT_DBG("sock %p, sk %p", sock, sk);
457
-
458459 poll_wait(file, sk_sleep(sk), wait);
459460
460461 if (sk->sk_state == BT_LISTEN)
....@@ -519,14 +520,6 @@
519520 amount = skb ? skb->len : 0;
520521 release_sock(sk);
521522 err = put_user(amount, (int __user *) arg);
522
- break;
523
-
524
- case SIOCGSTAMP:
525
- err = sock_get_timestamp(sk, (struct timeval __user *) arg);
526
- break;
527
-
528
- case SIOCGSTAMPNS:
529
- err = sock_get_timestampns(sk, (struct timespec __user *) arg);
530523 break;
531524
532525 default:
....@@ -743,7 +736,7 @@
743736
744737 err = bt_sysfs_init();
745738 if (err < 0)
746
- return err;
739
+ goto cleanup_led;
747740
748741 err = sock_register(&bt_sock_family_ops);
749742 if (err)
....@@ -779,6 +772,8 @@
779772 sock_unregister(PF_BLUETOOTH);
780773 cleanup_sysfs:
781774 bt_sysfs_cleanup();
775
+cleanup_led:
776
+ bt_leds_cleanup();
782777 return err;
783778 }
784779