Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  c274af2242 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/

Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8de ("bonding: fix macvlan over alb bond support")
  f11e5bd159 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags")

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

2023-08-24 10:51:39 -07:00

..

ipv4

…

ipv6

…

br_netfilter.h

…

nf_bpf_link.h

bpf: minimal support for programs hooked into netfilter framework

2023-04-21 11:34:14 -07:00

nf_conntrack_acct.h

netfilter: conntrack: Remove unused function declarations

2023-08-08 13:02:00 +02:00

nf_conntrack_act_ct.h

…

nf_conntrack_bpf.h

net: netfilter: move bpf_ct_set_nat_info kfunc in nf_nat_bpf.c

2022-10-03 09:17:32 -07:00

nf_conntrack_bridge.h

…

nf_conntrack_core.h

netfilter: conntrack: fix wrong ct->timeout value

2023-04-19 12:08:38 +02:00

nf_conntrack_count.h

netfilter: nf_conncount: reduce unnecessary GC

2022-05-16 13:05:40 +02:00

nf_conntrack_ecache.h

netfilter: prefer extension check to pointer check

2022-05-13 18:56:28 +02:00

nf_conntrack_expect.h

netfilter: allow exp not to be removed in nf_ct_find_expectation

2023-07-20 10:06:36 +02:00

nf_conntrack_extend.h

netfilter: extensions: introduce extension genid count

2022-05-13 18:52:16 +02:00

nf_conntrack_helper.h

netfilter: helper: Remove unused function declarations

2023-08-08 13:01:59 +02:00

nf_conntrack_l4proto.h

…

nf_conntrack_labels.h

netfilter: conntrack: Remove unused function declarations

2023-08-08 13:02:00 +02:00

nf_conntrack_seqadj.h

…

nf_conntrack_synproxy.h

…

nf_conntrack_timeout.h

netfilter: nf_conntrack: add missing __rcu annotations

2022-07-11 16:25:15 +02:00

nf_conntrack_timestamp.h

…

nf_conntrack_tuple.h

netfilter: conntrack: don't fold port numbers into addresses before hashing

2023-07-05 14:42:16 +02:00

nf_conntrack_zones.h

…

nf_conntrack.h

netfilter: conntrack: Remove unused function declarations

2023-08-08 13:02:00 +02:00

nf_dup_netdev.h

…

nf_flow_table.h

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

2023-06-15 22:19:41 -07:00

nf_hooks_lwtunnel.h

…

nf_log.h

…

nf_nat_helper.h

netfilter: nat: move repetitive nat port reserve loop to a helper

2022-09-07 16:46:04 +02:00

nf_nat_masquerade.h

…

nf_nat_redirect.h

netfilter: nft_redir: use struct nf_nat_range2 throughout and deduplicate eval call-backs

2023-03-22 21:48:59 +01:00

nf_nat.h

net: move the nat function to nf_nat_ovs for ovs and tc

2022-12-12 10:14:03 +00:00

nf_queue.h

treewide: use get_random_u32() when possible

2022-10-11 17:42:58 -06:00

nf_reject.h

netfilter: conntrack: skip verification of zero UDP checksum

2022-05-13 18:56:28 +02:00

nf_socket.h

…

nf_synproxy.h

…

nf_tables_core.h

netfilter: nf_tables: avoid retpoline overhead for some ct expression calls

2023-01-18 13:05:25 +01:00

nf_tables_ipv4.h

netfilter: use skb_ip_totlen and iph_totlen

2023-02-01 20:54:27 -08:00

nf_tables_ipv6.h

netfilter: nf_tables: reduce nft_pktinfo by 8 bytes

2022-10-25 13:44:14 +02:00

nf_tables_offload.h

netfilter: nf_tables: bail out early if hardware offload is not supported

2022-06-06 19:19:15 +02:00

nf_tables.h

netfilter: nf_tables: defer gc run if previous batch is still pending

2023-08-23 16:12:59 +02:00

nf_tproxy.h

netfilter: tproxy: fix deadlock due to missing BH disable

2023-03-06 12:09:48 +01:00

nft_fib.h

netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters

2022-11-15 10:46:34 +01:00

nft_meta.h

netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters

2022-11-15 10:46:34 +01:00

nft_reject.h

netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters

2022-11-15 10:46:34 +01:00

xt_rateest.h

…