Jakub Kicinski 385f186aba Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR (net-6.13-rc6).

No conflicts.

Adjacent changes:

include/linux/if_vlan.h
  f91a5b8089 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
  3f330db306 ("net: reformat kdoc return statements")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2025-01-03 16:29:29 -08:00

..

ila

ila: serialize calls to nf_register_net_hooks()

2025-01-02 18:42:32 -08:00

netfilter

Merge tag 'nf-next-24-11-07' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next

2024-11-07 12:46:04 +01:00

addrconf_core.c

ipv6: Ensure natural alignment of const ipv6 loopback and router addresses

2024-01-30 12:43:18 +01:00

addrconf.c

netlink: correct nlmsg size for multicast notifications

2024-12-23 10:26:43 -08:00

addrlabel.c

ipv6: Use rtnl_register_many().

2024-10-15 18:52:26 -07:00

af_inet6.c

net: inet6: do not leave a dangling sk pointer in inet6_create()

2024-10-15 18:43:08 -07:00

ah6.c

net: fill in MODULE_DESCRIPTION()s for ipv6 modules

2024-02-09 14:12:01 -08:00

anycast.c

ipv6: switch inet6_acaddr_hash() to less predictable hash

2024-10-09 19:33:57 -07:00

calipso.c

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

datagram.c

ipv6: annotate data-races around np->ucast_oif

2023-12-11 10:59:17 +00:00

esp6_offload.c

xfrm: Add an inbound percpu state cache.

2024-10-29 11:56:18 +01:00

esp6.c

net: support non paged skb frags

2024-09-11 20:44:31 -07:00

exthdrs_core.c

ipv6: Fix out-of-bounds access in ipv6_find_tlv()

2023-05-24 08:43:39 +01:00

exthdrs_offload.c

net: gso: add HBH extension header offload support

2024-01-05 08:11:49 -08:00

exthdrs.c

net: ipv6: exthdrs: get rid of ipv6_skb_net()

2024-03-11 15:15:08 -07:00

fib6_notifier.c

net: do not acquire rtnl in fib_seq_sum()

2024-10-11 15:35:05 -07:00

fib6_rules.c

ipv6: fib_rules: Add flow label support

2024-12-19 16:02:22 +01:00

fou6.c

net: Add MODULE_DESCRIPTION entries to network modules

2020-06-20 21:33:57 -07:00

icmp.c

inetpeer: do not get a refcount in inet_getpeer()

2024-12-17 19:37:48 -08:00

inet6_connection_sock.c

net: implement lockless SO_PRIORITY

2023-10-01 19:09:54 +01:00

inet6_hashtables.c

inet6: constify 'struct net' parameter of various lookup helpers

2024-08-05 16:27:26 -07:00

ioam6_iptunnel.c

net: ipv6: ioam6_iptunnel: mitigate 2-realloc issue

2024-12-05 11:15:56 +01:00

ioam6.c

net: convert to nla_get_*_default()

2024-11-11 10:32:06 -08:00

ip6_checksum.c

net: udp: fix handling of CHECKSUM_COMPLETE packets

2018-10-24 14:18:16 -07:00

ip6_fib.c

ipv6: Fix soft lockups in fib6_select_path under high next hop churn

2024-11-11 15:26:10 -08:00

ip6_flowlabel.c

ipv6: move np->repflow to atomic flags

2023-09-15 10:33:48 +01:00

ip6_gre.c

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

2024-09-03 11:36:43 +02:00

ip6_icmp.c

net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending

2021-02-23 11:29:52 -08:00

ip6_input.c

net/ipv6: make use of the helper macro LIST_HEAD()

2024-09-06 18:10:21 -07:00

ip6_offload.c

net: gro: initialize network_offset in network layer

2024-05-27 16:46:59 -07:00

ip6_offload.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

ip6_output.c

inetpeer: do not get a refcount in inet_getpeer()

2024-12-17 19:37:48 -08:00

ip6_tunnel.c

ipv4: Convert ip_route_input() to dscp_t.

2024-10-03 16:21:21 -07:00

ip6_udp_tunnel.c

net: fill in MODULE_DESCRIPTION()s for ipv6 modules

2024-02-09 14:12:01 -08:00

ip6_vti.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

ip6mr.c

ipmr: tune the ipmr_can_free_table() checks.

2024-12-04 18:49:16 -08:00

ipcomp6.c

xfrm: ipcomp: add extack to ipcomp{4,6}_init_state

2022-09-29 07:18:00 +02:00

ipv6_sockglue.c

ipv6: avoid indirect calls for SOL_IP socket options

2024-08-26 14:53:50 -07:00

Kconfig

net: ipv6: select DST_CACHE from IPV6_RPL_LWTUNNEL

2024-09-22 19:52:07 +01:00

Makefile

net/tcp: Introduce TCP_AO setsockopt()s

2023-10-27 10:35:44 +01:00

mcast_snoop.c

net: bridge: mcast: fix broken length + header check for MRDv6 Adv.

2021-04-27 14:02:06 -07:00

mcast.c

netlink: correct nlmsg size for multicast notifications

2024-12-23 10:26:43 -08:00

mip6.c

net: fill in MODULE_DESCRIPTION()s for ipv6 modules

2024-02-09 14:12:01 -08:00

ndisc.c

inetpeer: do not get a refcount in inet_getpeer()

2024-12-17 19:37:48 -08:00

netfilter.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-06-13 13:13:46 -07:00

output_core.c

ipv6: annotate data-races around cnf.hop_limit

2024-03-01 08:42:31 +00:00

ping.c

sock: support SO_PRIORITY cmsg

2024-12-16 18:13:44 -08:00

proc.c

minmax: add a few more MIN_T/MAX_T users

2024-07-28 13:41:14 -07:00

protocol.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

raw.c

sock: support SO_PRIORITY cmsg

2024-12-16 18:13:44 -08:00

reassembly.c

net: Rename mono_delivery_time to tstamp_type for scalabilty

2024-05-23 14:14:23 -07:00

route.c

ipv6: Add flow label to route get requests

2024-12-19 16:02:22 +01:00

rpl_iptunnel.c

net: ipv6: rpl_iptunnel: mitigate 2-realloc issue

2024-12-05 11:15:56 +01:00

rpl.c

ipv6: rpl: Remove pskb(_may)?_pull() in ipv6_rpl_srh_rcv().

2023-06-19 11:32:58 -07:00

seg6_hmac.c

ipv6: sr: fix memleak in seg6_hmac_init_algo

2024-05-21 13:16:25 +02:00

seg6_iptunnel.c

net: ipv6: seg6_iptunnel: mitigate 2-realloc issue

2024-12-05 11:15:56 +01:00

seg6_local.c

net: ip: make ip_route_input() return drop reasons

2024-11-12 11:24:51 +01:00

seg6.c

ipv6: sr: restruct ifdefines

2024-05-30 18:29:38 -07:00

sit.c

ipv6: sit: Unmask upper DSCP bits in ipip6_tunnel_bind_dev()

2024-09-04 16:57:11 -07:00

syncookies.c

tcp: use sk_skb_reason_drop to free rx packets

2024-06-19 12:44:22 +01:00

sysctl_net_ipv6.c

sysctl: treewide: constify the ctl_table argument of proc_handlers

2024-07-24 20:59:29 +02:00

tcp_ao.c

net/tcp: Wire up l3index to TCP-AO

2023-10-27 10:35:46 +01:00

tcp_ipv6.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-11-14 11:29:15 -08:00

tcpv6_offload.c

net: gso: fix tcp fraglist segmentation after pull from frag_list

2024-10-02 17:21:47 -07:00

tunnel6.c

net: fill in MODULE_DESCRIPTION()s for ipv6 modules

2024-02-09 14:12:01 -08:00

udp_impl.h

tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().

2022-10-12 17:50:37 -07:00

udp_offload.c

net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb

2024-05-02 11:02:48 +02:00

udp.c

udp: Deal with race between UDP socket address change and rehash

2024-12-23 11:39:55 +00:00

udplite.c

udplite: remove UDPLITE_BIT

2023-09-14 16:16:36 +02:00

xfrm6_input.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-05-09 10:01:01 -07:00

xfrm6_output.c

ipv6: drop feature RTAX_FEATURE_ALLFRAG

2023-10-25 18:04:29 -07:00

xfrm6_policy.c

xfrm: respect ip protocols rules criteria when performing dst lookups

2024-09-23 07:02:07 +02:00

xfrm6_protocol.c

xfrm: add support for UDPv6 encapsulation of ESP

2020-04-28 11:28:36 +02:00

xfrm6_state.c

xfrm: remove output_finish indirection from xfrm_state_afinfo

2020-05-06 09:40:08 +02:00

xfrm6_tunnel.c

Merge tag 'ipsec-next-2024-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2024-03-08 10:56:05 +00:00