Jakub Kicinski 59be3baa8d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

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

2023-07-20 15:52:55 -07:00

..

9p

…

bluetooth

Bluetooth: coredump: fix building with coredump disabled

2023-07-20 11:25:24 -07:00

caif

…

iucv

…

mana

Merge tag 'v6.4' into rdma.git for-next

2023-06-27 14:06:29 -03:00

netfilter

netfilter: allow exp not to be removed in nf_ct_find_expectation

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

netns

tcp: get rid of sysctl_tcp_adv_win_scale

2023-07-18 18:41:18 -07:00

nfc

…

phonet

net: ioctl: Use kernel memory on protocol ioctl callbacks

2023-06-15 22:33:26 -07:00

sctp

sctp: delete the nested flexible array peer_init

2023-04-21 08:19:30 +01:00

tc_act

…

6lowpan.h

…

act_api.h

…

addrconf.h

…

af_ieee802154.h

…

af_rxrpc.h

rxrpc: Fix timeout of a call that hasn't yet been granted a channel

2023-05-01 07:43:19 +01:00

af_unix.h

…

af_vsock.h

…

ah.h

…

amt.h

…

arp.h

…

atmclip.h

…

ax25.h

…

ax88796.h

…

bareudp.h

…

bond_3ad.h

…

bond_alb.h

…

bond_options.h

…

bonding.h

net: bonding: remove kernel-doc comment marker

2023-07-14 20:39:29 -07:00

bpf_sk_storage.h

…

busy_poll.h

…

calipso.h

…

cfg80211-wext.h

…

cfg80211.h

wifi: cfg80211: Retrieve PSD information from RNR AP information

2023-06-21 14:01:29 +02:00

cfg802154.h

net: cfg802154: fix kernel-doc notation warnings

2023-07-14 20:39:29 -07:00

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

…

codel_impl.h

…

codel_qdisc.h

…

codel.h

codel: fix kernel-doc notation warnings

2023-07-14 20:39:29 -07:00

compat.h

…

datalink.h

…

dcbevent.h

…

dcbnl.h

…

devlink.h

devlink: fix kernel-doc notation warnings

2023-07-14 20:39:29 -07:00

dropreason-core.h

tcp: add TCP_OLD_SEQUENCE drop reason

2023-07-20 12:49:40 +02:00

dropreason.h

mac80211: use the new drop reasons infrastructure

2023-04-20 20:20:49 -07:00

dsa_stubs.h

…

dsa.h

net: dsa: remove legacy_pre_march2020 detection

2023-07-18 09:47:08 +02:00

dsfield.h

…

dst_cache.h

…

dst_metadata.h

…

dst_ops.h

…

dst.h

…

erspan.h

…

esp.h

…

espintcp.h

…

ethoc.h

…

failover.h

…

fib_notifier.h

…

fib_rules.h

…

firewire.h

…

flow_dissector.h

net: flow_dissector: add support for cfm packets

2023-06-12 17:01:45 -07:00

flow_offload.h

…

flow.h

ipv4: Drop tos parameter from flowi4_update_output()

2023-06-02 10:52:38 +01:00

fou.h

…

fq_impl.h

…

fq.h

…

garp.h

…

gen_stats.h

…

genetlink.h

…

geneve.h

…

gre.h

…

gro_cells.h

…

gro.h

net: move gso declarations and functions to their own files

2023-06-10 00:11:41 -07:00

gso.h

net: move gso declarations and functions to their own files

2023-06-10 00:11:41 -07:00

gtp.h

…

gue.h

…

handshake.h

net/handshake: Enable the SNI extension to work properly

2023-05-24 22:05:24 -07:00

hwbm.h

…

icmp.h

…

ieee80211_radiotap.h

wifi: iwlwifi: mvm: support U-SIG EHT validate checks

2023-06-14 12:32:19 +02:00

ieee802154_netdev.h

…

if_inet6.h

…

ife.h

…

ila.h

…

inet6_connection_sock.h

…

inet6_hashtables.h

…

inet_common.h

sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)

2023-06-24 15:50:13 -07:00

inet_connection_sock.h

…

inet_dscp.h

…

inet_ecn.h

…

inet_frag.h

inet: frags: eliminate kernel-doc warning

2023-07-14 20:39:29 -07:00

inet_hashtables.h

…

inet_sock.h

…

inet_timewait_sock.h

…

inetpeer.h

…

ioam6.h

…

ip6_checksum.h

…

ip6_fib.h

…

ip6_route.h

…

ip6_tunnel.h

…

ip_fib.h

…

ip_tunnels.h

ip_tunnels: Add nexthop ID field to ip_tunnel_key

2023-07-19 10:53:48 +01:00

ip_vs.h

ipvs: Correct spelling in comments

2023-04-22 01:39:41 +02:00

ip.h

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

2023-05-25 19:57:39 -07:00

ipcomp.h

…

ipconfig.h

…

ipv6_frag.h

…

ipv6_stubs.h

…

ipv6.h

…

iw_handler.h

…

kcm.h

kcm: Send multiple frags in one sendmsg()

2023-06-12 21:13:23 -07:00

l3mdev.h

…

lag.h

…

lapb.h

…

lib80211.h

…

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

llc: Check netns in llc_estab_match() and llc_listener_match().

2023-07-20 10:46:28 +02:00

llc_if.h

…

llc_pdu.h

net: llc: fix kernel-doc notation warnings

2023-07-14 20:39:29 -07:00

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

…

llc.h

…

lwtunnel.h

…

mac80211.h

wifi: mac80211: fix documentation config reference

2023-06-21 09:16:57 +02:00

mac802154.h

…

macsec.h

macsec: Use helper macsec_netdev_priv for offload drivers

2023-05-10 11:32:09 +01:00

mctp.h

mctp: Reorder fields in 'struct mctp_route'

2023-06-20 20:06:16 -07:00

mctpdevice.h

…

mip6.h

…

mld.h

…

mpls_iptunnel.h

…

mpls.h

…

mptcp.h

…

mrp.h

…

ncsi.h

…

ndisc.h

…

neighbour.h

neighbour: fix unaligned access to pneigh_entry

2023-06-01 21:36:37 -07:00

net_debug.h

…

net_failover.h

…

net_namespace.h

…

net_ratelimit.h

…

net_trackers.h

…

netdev_queues.h

…

netevent.h

…

netlabel.h

…

netlink.h

…

netprio_cgroup.h

…

netrom.h

…

nexthop.h

ipv6: remove nexthop_fib6_nh_bh()

2023-05-11 18:07:05 -07:00

nl802154.h

…

nsh.h

net: NSH: fix kernel-doc notation warning

2023-07-14 20:39:29 -07:00

p8022.h

…

page_pool.h

page_pool: fix inconsistency for page_pool_ring_[un]lock()

2023-05-23 20:25:13 -07:00

pie.h

pie: fix kernel-doc notation warning

2023-07-14 20:39:30 -07:00

ping.h

net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294

2023-06-02 09:55:22 +01:00

pkt_cls.h

sch_htb: Allow HTB priority parameter in offload mode

2023-05-15 09:31:07 +01:00

pkt_sched.h

net/sched: make psched_mtu() RTNL-less safe

2023-07-12 15:59:33 -07:00

pptp.h

…

protocol.h

…

psample.h

…

psnap.h

…

raw.h

…

rawv6.h

…

red.h

…

regulatory.h

wifi: cfg80211: fix regulatory disconnect with OCB/NAN

2023-06-19 12:05:29 +02:00

request_sock.h

…

rose.h

…

route.h

ipv4: Constify the sk parameter of ip_route_output_*().

2023-07-14 08:27:33 +01:00

rpl.h

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

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

rsi_91x.h

rsi: remove kernel-doc comment marker

2023-07-14 20:39:30 -07:00

rtnetlink.h

…

rtnh.h

…

sch_generic.h

bpf: Add fd-based tcx multi-prog infra with link support

2023-07-19 10:07:27 -07:00

scm.h

net: scm: introduce and use scm_recv_unix helper

2023-06-27 10:50:22 -07:00

secure_seq.h

…

seg6_hmac.h

…

seg6_local.h

…

seg6.h

…

selftests.h

…

slhc_vj.h

…

smc.h

…

snmp.h

…

sock_reuseport.h

…

sock.h

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

2023-06-27 09:45:22 -07:00

Space.h

…

stp.h

…

strparser.h

…

switchdev.h

…

tc_wrapper.h

…

tcp_states.h

…

tcp.h

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

2023-07-20 15:52:55 -07:00

tcx.h

bpf: Add fd-based tcx multi-prog infra with link support

2023-07-19 10:07:27 -07:00

timewait_sock.h

…

tipc.h

…

tls_toe.h

…

tls.h

net: tls: make the offload check helper take skb not socket

2023-06-15 09:01:05 +01:00

transp_v6.h

…

tso.h

…

tun_proto.h

…

udp_tunnel.h

…

udp.h

net: ioctl: Use kernel memory on protocol ioctl callbacks

2023-06-15 22:33:26 -07:00

udplite.h

…

vsock_addr.h

…

vxlan.h

net: vxlan: Add nolocalbypass option to vxlan.

2023-05-13 17:02:33 +01:00

wext.h

…

x25.h

…

x25device.h

…

xdp_priv.h

…

xdp_sock_drv.h

xsk: support mbuf on ZC RX

2023-07-19 09:56:49 -07:00

xdp_sock.h

xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path

2023-07-19 09:56:49 -07:00

xdp.h

…

xfrm.h

xfrm: Treat already-verified secpath entries as optional

2023-05-21 09:21:37 +02:00

xsk_buff_pool.h

xsk: support mbuf on ZC RX

2023-07-19 09:56:49 -07:00