write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/net/bluetooth/af_bluetooth.c
..
..
@@ -173,7 +173,7 @@
173
173
 	else
174
174
 		release_sock(sk);
175
175
 
176
-	parent->sk_ack_backlog++;
176
+	sk_acceptq_added(parent);
177
177
 }
178
178
 EXPORT_SYMBOL(bt_accept_enqueue);
179
179
 
..
..
@@ -185,7 +185,7 @@
185
185
 	BT_DBG("sk %p state %d", sk, sk->sk_state);
186
186
 
187
187
 	list_del_init(&bt_sk(sk)->accept_q);
188
-	bt_sk(sk)->parent->sk_ack_backlog--;
188
+	sk_acceptq_removed(bt_sk(sk)->parent);
189
189
 	bt_sk(sk)->parent = NULL;
190
190
 	sock_put(sk);
191
191
 }
..
..
@@ -286,6 +286,9 @@
286
286
 		if (msg->msg_name && bt_sk(sk)->skb_msg_name)
287
287
 			bt_sk(sk)->skb_msg_name(skb, msg->msg_name,
288
288
 						&msg->msg_namelen);
289
+
290
+		if (bt_sk(sk)->skb_put_cmsg)
291
+			bt_sk(sk)->skb_put_cmsg(skb, msg, sk);
289
292
 	}
290
293
 
291
294
 	skb_free_datagram(sk, skb);
..
..
@@ -453,8 +456,6 @@
453
456
 	struct sock *sk = sock->sk;
454
457
 	__poll_t mask = 0;
455
458
 
456
-	BT_DBG("sock %p, sk %p", sock, sk);
457
-
458
459
 	poll_wait(file, sk_sleep(sk), wait);
459
460
 
460
461
 	if (sk->sk_state == BT_LISTEN)
..
..
@@ -519,14 +520,6 @@
519
520
 		amount = skb ? skb->len : 0;
520
521
 		release_sock(sk);
521
522
 		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);
530
523
 		break;
531
524
 
532
525
 	default:
..
..
@@ -743,7 +736,7 @@
743
736
 
744
737
 	err = bt_sysfs_init();
745
738
 	if (err < 0)
746
-		return err;
739
+		goto cleanup_led;
747
740
 
748
741
 	err = sock_register(&bt_sock_family_ops);
749
742
 	if (err)
..
..
@@ -779,6 +772,8 @@
779
772
 	sock_unregister(PF_BLUETOOTH);
780
773
 cleanup_sysfs:
781
774
 	bt_sysfs_cleanup();
775
+cleanup_led:
776
+	bt_leds_cleanup();
782
777
 	return err;
783
778
 }
784
779