From cf8861e19dc4b11519cbd30c49f99b633e0ad670 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 May 2025 09:49:03 +0000 Subject: [PATCH] Revert "Bluetooth: L2CAP: copy RX timestamp to new fragments" This reverts commit 8c7bfb6198a7f2489a149b81178f1cb3750c5d3a which is commit 3908feb1bd7f319a10e18d84369a48163264cc7d upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Id8e36cd9dc828f42be27fb8ce27b53c9843fcdef Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/l2cap_core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 72ee41b894a5..d4dcdb2370cc 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -7386,9 +7386,6 @@ static int l2cap_recv_frag(struct l2cap_conn *conn, struct sk_buff *skb, return -ENOMEM; /* Init rx_len */ conn->rx_len = len; - - skb_set_delivery_time(conn->rx_skb, skb->tstamp, - skb->tstamp_type); } /* Copy as much as the rx_skb can hold */