Greg Kroah-Hartman 45a7ce8a2b ANDROID: GKI: fix up build break where timer_delete_sync() was used ...

We reverted the commit that renamed del_timer_sync() to
timer_delete_sync() a long while back, but that broke the build when
commit 5071beb59e ("tcp/dccp: Don't use timer_pending() in
reqsk_queue_unlink().") was applied.  So fix it up to use the old
function name instead, allowing the build to work properly.

Fixes: 5071beb59e ("tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink().")
Change-Id: I88112c8da97506f5c0028119f318ae8f730105fa
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

2024-11-15 17:56:59 +00:00

..

6lowpan

…

9p

net/9p: fix uninit-value in p9_client_rpc()

2024-06-16 13:41:38 +02:00

802

…

8021q

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

appletalk

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

atm

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

ax25

ax25: Replace kfree() in ax25_dev_free() with ax25_dev_put()

2024-06-21 14:35:32 +02:00

batman-adv

Merge 6.1.97 into android14-6.1-lts

2024-09-06 11:23:41 +00:00

bluetooth

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

bpf

bpf: Set run context for rawtp test_run callback

2024-06-21 14:35:33 +02:00

bpfilter

…

bridge

Merge 5de0b8ca7c ("sctp: ensure sk_state is set to CLOSED if hashing fails in sctp_listen_start") into android14-6.1

2024-11-14 08:35:13 +00:00

caif

…

can

can: bcm: Clear bo->bcm_proc_read after remove_proc_entry().

2024-10-17 15:20:42 +02:00

ceph

libceph: fix race between delayed_work() and ceph_monc_stop()

2024-07-18 13:18:41 +02:00

core

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

dcb

…

dccp

Merge 6.1.107 into android14-6.1-lts

2024-10-01 11:35:58 +00:00

devlink

devlink: bump the instance index directly when iterating

2024-10-22 15:56:43 +02:00

dns_resolver

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

dsa

net: mscc: ocelot: use ocelot_xmit_get_vlan_info() also for FDMA and register injection

2024-08-29 17:30:43 +02:00

ethernet

ethernet: Add helper for assigning packet type when dest address does not match device address

2024-05-02 16:29:29 +02:00

ethtool

Merge 6.1.108 into android14-6.1-lts

2024-10-01 14:30:35 +00:00

hsr

Revert "timers: Rename del_timer() to timer_delete()"

2024-07-24 09:28:02 +00:00

ieee802154

…

ife

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

ipv4

ANDROID: GKI: fix up build break where timer_delete_sync() was used

2024-11-15 17:56:59 +00:00

ipv6

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

iucv

s390/iucv: fix receive buffer virtual vs physical address confusion

2024-08-29 17:30:39 +02:00

kcm

kcm: Serialise kcm_sendmsg() for the same socket.

2024-08-29 17:30:44 +02:00

key

…

l2tp

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

l3mdev

…

lapb

…

llc

llc: call sock_orphan() at release time

2024-02-05 20:13:01 +00:00

mac80211

Merge 6.1.113 into android14-6.1-lts

2024-11-14 10:29:43 +00:00

mac802154

net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()

2024-07-25 09:49:17 +02:00

mctp

mctp: Handle error of rtnl_register_module().

2024-10-17 15:22:23 +02:00

mpls

net: mpls: error out if inner headers are not set

2024-04-13 13:05:27 +02:00

mptcp

Merge 6.1.114 into android14-6.1-lts

2024-11-14 10:32:51 +00:00

ncsi

net/ncsi: Fix the multi thread manner of NCSI driver

2024-06-21 14:35:33 +02:00

netfilter

UPSTREAM: netfilter: xtables: fix typo causing some targets not to load on IPv6

2024-11-14 10:27:32 +00:00

netlabel

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

netlink

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

netrom

netrom: Fix a memory leak in nr_heartbeat_expiry()

2024-06-27 13:46:18 +02:00

nfc

nfc: nci: Fix handling of zero-length payload packets in nci_rx_work()

2024-06-12 11:03:53 +02:00

nsh

nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().

2024-05-17 11:55:59 +02:00

openvswitch

openvswitch: Set the skbuff pkt_type for proper pmtud support.

2024-06-12 11:03:51 +02:00

packet

Merge 6.1.103 into android14-6.1-lts

2024-09-11 11:12:13 +00:00

phonet

phonet: fix rtm_phonet_notify() skb allocation

2024-05-17 11:56:12 +02:00

psample

psample: Require 'CAP_NET_ADMIN' when joining "packets" group

2023-12-13 18:39:11 +01:00

qrtr

net: qrtr: Update packets cloning when broadcasting

2024-10-17 15:21:13 +02:00

rds

net:rds: Fix possible deadlock in rds_message_put

2024-08-29 17:30:20 +02:00

rfkill

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

rose

Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"

2024-04-02 19:49:12 +00:00

rxrpc

rxrpc: Fix response to PING RESPONSE ACKs to a dead call

2024-02-16 19:06:27 +01:00

sched

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

sctp

Merge 5de0b8ca7c ("sctp: ensure sk_state is set to CLOSED if hashing fails in sctp_listen_start") into android14-6.1

2024-11-14 08:35:13 +00:00

smc

net/smc: Fix searching in list of known pnetids in smc_pnet_add_pnetid

2024-11-01 01:55:59 +01:00

strparser

…

sunrpc

sunrpc: use the struct net as the svc proc private

2024-08-19 06:00:05 +02:00

switchdev

net: bridge: switchdev: Skip MDB replays of deferred events on offload

2024-03-01 13:26:35 +01:00

tipc

tipc: guard against string buffer overrun

2024-10-17 15:21:38 +02:00

tls

Merge 6.1.93 into android14-6.1-lts

2024-08-12 08:40:51 +00:00

unix

Merge 9dc7ad2b67 ("perf/aux: Fix AUX buffer serialization") into android14-6.1-lts

2024-10-02 08:56:19 +00:00

vmw_vsock

Revert "vsock/virtio: fix packet delivery to tap device"

2024-06-03 09:53:36 +00:00

wireless

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

x25

net/x25: fix incorrect parameter validation in the x25_getsockopt() function

2024-03-26 18:20:42 -04:00

xdp

xsk: validate user input for XDP_{UMEM|COMPLETION}_FILL_RING

2024-04-17 11:18:23 +02:00

xfrm

Merge 6.1.115 into android14-6.1-lts

2024-11-15 16:07:11 +00:00

compat.c

…

devres.c

…

Kconfig

…

Kconfig.debug

…

Makefile

…

socket.c

Merge 6.1.113 into android14-6.1-lts

2024-11-14 10:29:43 +00:00

sysctl_net.c

Revert "sysctl: treewide: drop unused argument ctl_table_root::set_ownership(table)"

2024-09-14 14:31:33 +00:00

TEST_MAPPING

…