mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-07 20:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
76ed626479ebe0227728eff16bb44544ebd98920
linux/include/net
History
Jakub Kicinski 76ed626479 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/aquantia/aquantia.h
  219343755e ("net: phy: aquantia: add missing include guards")
  61578f6793 ("net: phy: aquantia: add support for PHY LEDs")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  bd07a98178 ("net: txgbe: remove separate irq request for MSI and INTx")
  b501d261a5 ("net: txgbe: add FDIR ATR support")
https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/

include/linux/mlx5/mlx5_ifc.h
  048a403648 ("net/mlx5: IFC updates for changing max EQs")
  99be56171f ("net/mlx5e: SHAMPO, Re-enable HW-GRO")
https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/

Adjacent changes:

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
  4130c67cd1 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f3126515f ("wifi: iwlwifi: mvm: add mvm-specific guard")

include/net/mac80211.h
  816c6bec09 ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP")
  5a009b42e0 ("wifi: mac80211: track changes in AP's TPE")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-07-04 14:16:11 -07:00
..
9p
netfs, 9p: Implement helpers for new write code
2024-05-01 18:07:37 +01:00
bluetooth
Bluetooth: L2CAP: Fix deadlock
2024-06-28 14:32:02 -04:00
caif
net: caif: remove unused structs
2024-06-05 10:18:06 +01:00
iucv
s390/iucv: Unexport iucv_root
2024-05-14 20:21:04 +02:00
libeth
libeth: add Rx buffer management
2024-04-24 11:06:25 -07:00
mana
net: mana: Add support for page sizes other than 4KB on ARM64
2024-06-18 18:21:18 -07:00
netfilter
Merge tag 'nf-next-24-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next into main
2024-07-01 09:52:35 +01:00
netns
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-06-20 13:49:59 -07:00
nfc
nfc: core: make nfc_class constant
2024-03-05 11:21:18 -08:00
page_pool
page_pool: convert to use netmem
2024-07-02 18:59:33 -07:00
phonet
…
sctp
sctp: preserve const qualifier in sctp_sk()
2024-02-05 11:08:06 +00:00
tc_act
net/sched: Retire ipt action
2024-01-02 12:41:16 +00:00
6lowpan.h
…
act_api.h
net/sched: Add helper macros with module names
2024-02-02 10:57:55 -08:00
addrconf.h
ipv6: fix race condition between ipv6_get_ifaddr and ipv6_del_addr
2024-04-09 17:09:05 -07:00
af_ieee802154.h
…
af_rxrpc.h
rxrpc, afs: Allow afs to pin rxrpc_peer objects
2023-12-24 15:22:50 +00:00
af_unix.h
af_unix: Remove U_LOCK_GC_LISTENER.
2024-06-25 11:10:18 +02:00
af_vsock.h
virtio/vsock: send credit update during setting SO_RCVLOWAT
2023-12-15 10:37:35 +00:00
ah.h
…
amt.h
…
arp.h
…
atmclip.h
…
ax25.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-05-14 10:53:19 -07:00
ax88796.h
…
bareudp.h
…
bond_3ad.h
bonding: Add independent control state machine
2024-02-06 13:17:54 +01:00
bond_alb.h
…
bond_options.h
bonding: Add independent control state machine
2024-02-06 13:17:54 +01:00
bonding.h
bonding: Add independent control state machine
2024-02-06 13:17:54 +01:00
bpf_sk_storage.h
…
busy_poll.h
net: add napi_busy_loop_rcu()
2024-02-09 10:01:09 -08:00
calipso.h
…
cfg80211-wext.h
…
cfg80211.h
wifi: cfg80211: add regulatory flag to allow VLP AP operation
2024-06-12 13:04:25 +02:00
cfg802154.h
mac802154: fix llsec key resources release in mac802154_llsec_key_del
2024-03-06 21:01:26 +01:00
checksum.h
…
cipso_ipv4.h
netlabel: fix RCU annotation for IPv4 options on socket creation
2024-05-13 14:58:12 -07:00
cls_cgroup.h
…
codel_impl.h
…
codel_qdisc.h
…
codel.h
…
compat.h
…
datalink.h
…
dcbevent.h
…
dcbnl.h
…
devlink.h
devlink: Constify the 'table_ops' parameter of devl_dpipe_table_register()
2024-06-05 10:24:57 +01:00
dropreason-core.h
tcp: introduce dropreasons in receive path
2024-02-28 10:39:21 +00:00
dropreason.h
…
dsa_stubs.h
net: dsa: Use conduit and user terms
2023-10-24 13:08:14 -07:00
dsa.h
net: dsa: remove mac_prepare()/mac_finish() shims
2024-05-29 18:41:15 -07:00
dscp.h
net: add IEEE 802.1q specific helpers
2024-05-08 10:35:09 +01:00
dsfield.h
…
dst_cache.h
net: dst_cache: annotate data-races around dst_cache->reset_ts
2024-05-08 18:49:51 -07:00
dst_metadata.h
ip_tunnel: convert __be16 tunnel flags to bitmaps
2024-04-01 10:49:28 +01:00
dst_ops.h
net: fix __dst_negative_advice() race
2024-05-29 17:34:49 -07:00
dst.h
net: dst: Make dst_destroy() static and return void.
2024-02-06 11:45:53 +01:00
eee.h
net: add helpers for EEE configuration
2024-03-05 19:21:17 -08:00
erspan.h
…
esp.h
…
espintcp.h
inet: preserve const qualifier in inet_csk()
2024-04-01 21:27:08 -07:00
ethoc.h
…
failover.h
…
fib_notifier.h
…
fib_rules.h
fib: remove unnecessary input parameters in fib_default_rule_add
2024-01-03 16:42:48 -08:00
firewire.h
…
flow_dissector.h
net: ipv4: Add a sysctl to set multipath hash seed
2024-06-12 16:42:11 -07:00
flow_offload.h
flow_offload: add encapsulation control flag helpers
2024-06-12 17:56:00 -07:00
flow.h
inet: shrink struct flowi_common
2023-11-02 09:31:02 +01:00
fou.h
…
fq_impl.h
…
fq.h
…
garp.h
…
gen_stats.h
…
genetlink.h
genetlink: remove linux/genetlink.h
2024-04-01 21:44:34 -07:00
geneve.h
…
gre.h
ip_tunnel: convert __be16 tunnel flags to bitmaps
2024-04-01 10:49:28 +01:00
gro_cells.h
…
gro.h
net: gro: fix napi_gro_cb zeroed alignment
2024-05-14 10:49:50 -07:00
gso.h
…
gtp.h
gtp: properly parse extension headers
2024-05-07 01:35:55 +02:00
gue.h
…
handshake.h
…
hotdata.h
net: move sysctl_mem_pcpu_rsv to net_hotdata
2024-04-30 18:46:52 -07:00
hwbm.h
…
icmp.h
…
ieee8021q.h
net: add IEEE 802.1q specific helpers
2024-05-08 10:35:09 +01:00
ieee80211_radiotap.h
wifi: radiotap: document ieee80211_get_radiotap_len() return value
2024-05-23 10:19:39 +02:00
ieee802154_netdev.h
mac802154: Handle association requests from peers
2023-11-20 11:43:03 +01:00
if_inet6.h
ipv6: anycast: complete RCU handling of struct ifacaddr6
2024-02-26 18:40:34 -08:00
ife.h
…
inet6_connection_sock.h
…
inet6_hashtables.h
…
inet_common.h
net: change proto and proto_ops accept type
2024-05-13 18:19:09 -06:00
inet_connection_sock.h
Fix race for duplicate reqsk on identical SYN
2024-06-25 11:37:45 +02:00
inet_dscp.h
…
inet_ecn.h
…
inet_frag.h
net: Rename mono_delivery_time to tstamp_type for scalabilty
2024-05-23 14:14:23 -07:00
inet_hashtables.h
tcp: Remove dead code and fields for bhash2.
2023-12-22 22:15:35 +00:00
inet_sock.h
inet: Add getsockopt support for IP_ROUTER_ALERT and IPV6_ROUTER_ALERT
2024-03-06 12:37:06 +00:00
inet_timewait_sock.h
tcp: move inet_twsk_schedule helper out of header
2024-06-10 11:54:18 +01:00
inetpeer.h
…
ioam6.h
net: ioam6: multicast event
2024-02-28 11:19:41 +00:00
ip6_checksum.h
…
ip6_fib.h
ipv6: introduce dst_rt6_info() helper
2024-04-29 13:32:01 +01:00
ip6_route.h
ipv6: introduce dst_rt6_info() helper
2024-04-29 13:32:01 +01:00
ip6_tunnel.h
ip_tunnel: convert __be16 tunnel flags to bitmaps
2024-04-01 10:49:28 +01:00
ip_fib.h
net: ipv4: Add a sysctl to set multipath hash seed
2024-06-12 16:42:11 -07:00
ip_tunnels.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-06-13 13:13:46 -07:00
ip_vs.h
…
ip.h
net: remove NULL-pointer net parameter in ip_metrics_convert
2024-06-05 10:06:00 +01:00
ipcomp.h
…
ipconfig.h
…
ipv6_frag.h
…
ipv6_stubs.h
Merge tag 'ipsec-next-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2023-10-30 14:36:57 -07:00
ipv6.h
ipv6: annotate data-races around cnf.forwarding
2024-03-01 08:42:31 +00:00
iw_handler.h
wifi: wext: Remove unused declaration dev_get_wireless_info()
2023-08-22 21:40:40 +02:00
kcm.h
…
l3mdev.h
…
lag.h
…
lapb.h
…
lib80211.h
…
llc_c_ac.h
…
llc_c_ev.h
…
llc_c_st.h
…
llc_conn.h
…
llc_if.h
…
llc_pdu.h
llc: Drop support for ETH_P_TR_802_2.
2024-01-19 21:30:09 -08:00
llc_s_ac.h
…
llc_s_ev.h
…
llc_s_st.h
…
llc_sap.h
…
llc.h
…
lwtunnel.h
…
mac80211.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
mac802154.h
…
macsec.h
macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads
2024-04-25 08:20:54 -07:00
mctp.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-02-29 14:24:56 -08:00
mctpdevice.h
…
mip6.h
…
mld.h
…
mpls_iptunnel.h
…
mpls.h
…
mptcp.h
mptcp: add net.mptcp.available_schedulers
2024-05-13 18:29:23 -07:00
mrp.h
…
ncsi.h
…
ndisc.h
…
neighbour.h
neighbour: Fix __randomize_layout crash in struct neighbour
2023-11-28 12:18:29 +01:00
net_debug.h
…
net_failover.h
…
net_namespace.h
net: add exit_batch_rtnl() method
2024-02-07 18:55:10 -08:00
net_ratelimit.h
…
net_trackers.h
…
netdev_queues.h
net: qstat: extend kdoc about get_base_stats
2024-06-01 15:11:52 -07:00
netdev_rx_queue.h
net: Add queue and napi association
2023-12-04 18:04:05 -08:00
netevent.h
…
netkit.h
bpf, netkit: Add indirect call wrapper for fetching peer dev
2023-11-20 10:15:16 -08:00
netlabel.h
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
netlink.h
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
netmem.h
page_pool: convert to use netmem
2024-07-02 18:59:33 -07:00
netprio_cgroup.h
…
netrom.h
…
nexthop.h
net: add two more call_rcu_hurry()
2024-04-25 15:24:23 -07:00
nl802154.h
ieee802154: Give the user the association list
2023-11-20 11:43:45 +01:00
nsh.h
…
p8022.h
…
pfcp.h
pfcp: always set pfcp metadata
2024-04-01 10:49:28 +01:00
pie.h
…
ping.h
…
pkt_cls.h
net: sched: make skip_sw actually skip software
2024-03-29 09:46:39 +00:00
pkt_sched.h
net/sched: Add helper macros with module names
2024-02-02 10:57:55 -08:00
pptp.h
…
proto_memory.h
net: move sysctl_mem_pcpu_rsv to net_hotdata
2024-04-30 18:46:52 -07:00
protocol.h
ipv6: move tcp_ipv6_hash_secret and udp_ipv6_hash_secret to net_hotdata
2024-03-07 21:12:43 -08:00
psample.h
…
psnap.h
…
raw.h
…
rawv6.h
…
red.h
net_sched: sch_choke: implement lockless choke_dump()
2024-04-19 11:34:07 +01:00
regulatory.h
wifi: regulatory: remove extra documentation
2024-05-23 10:19:34 +02:00
request_sock.h
tcp: move reqsk_alloc() to inet_connection_sock.c
2024-06-06 15:18:04 +02:00
rose.h
…
route.h
inet: introduce dst_rtable() helper
2024-04-30 18:32:38 -07:00
rpl.h
…
rps.h
net: rps: add rps_input_queue_head_add() helper
2024-04-01 11:28:32 +01:00
rsi_91x.h
…
rstreason.h
tcp: rstreason: fully support in tcp_check_req()
2024-05-13 17:33:57 -07:00
rtnetlink.h
rtnetlink: make the "split" NLM_DONE handling generic
2024-06-05 12:34:54 +01:00
rtnh.h
…
sch_generic.h
net/sched: fix false lockdep warning on qdisc root lock
2024-04-26 10:46:41 +02:00
scm.h
af_unix: Add dead flag to struct scm_fp_list.
2024-05-10 18:52:45 -07:00
secure_seq.h
…
seg6_hmac.h
ipv6: sr: restruct ifdefines
2024-05-30 18:29:38 -07:00
seg6_local.h
seg6: Use nested-BH locking for seg6_bpf_srh_states.
2024-06-24 16:41:23 -07:00
seg6.h
ipv6: sr: restruct ifdefines
2024-05-30 18:29:38 -07:00
selftests.h
…
slhc_vj.h
…
smc.h
net/smc: add operations to merge sndbuf with peer DMB
2024-04-30 13:24:48 +02:00
snmp.h
…
sock_reuseport.h
…
sock.h
net/ipv4: Use nested-BH locking for ipv4_tcp_sk.
2024-06-24 16:41:22 -07:00
Space.h
net: appletalk: remove cops support
2023-10-04 11:49:20 -07:00
stp.h
…
strparser.h
…
switchdev.h
net: bridge: switchdev: Skip MDB replays of deferred events on offload
2024-02-16 09:36:37 +00:00
tc_wrapper.h
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
2024-02-14 10:49:37 +01:00
tcp_ao.h
net/tcp: Remove tcp_hash_fail()
2024-06-12 06:39:04 +01:00
tcp_states.h
tcp: Dump bound-only sockets in inet_diag.
2023-12-04 14:45:26 -08:00
tcp.h
net/tcp: Move tcp_inbound_hash() from headers
2024-06-12 06:39:04 +01:00
tcx.h
mm: change inlined allocation helpers to account at the call site
2024-04-25 20:55:59 -07:00
timewait_sock.h
tcp: get rid of twsk_unique()
2024-05-09 20:25:55 -07:00
tipc.h
…
tls_prot.h
…
tls_toe.h
…
tls.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-04-25 12:41:37 -07:00
transp_v6.h
…
tso.h
…
tun_proto.h
…
udp_tunnel.h
ip_tunnel: convert __be16 tunnel flags to bitmaps
2024-04-01 10:49:28 +01:00
udp.h
new helper: copy_to_iter_full()
2024-04-07 02:42:36 -04:00
udplite.h
udplite: fix various data-races
2023-09-14 16:16:36 +02:00
vsock_addr.h
…
vxlan.h
vxlan: add support for flowlabel inherit
2023-11-16 22:33:31 +00:00
wext.h
…
x25.h
…
x25device.h
…
xdp_priv.h
…
xdp_sock_drv.h
xsk: use generic DMA sync shortcut instead of a custom one
2024-05-08 08:51:20 +02:00
xdp_sock.h
net: Optimize xdp_do_flush() with bpf_net_context infos.
2024-07-02 15:26:57 +02:00
xdp.h
net, xdp: Correct grammar
2023-12-14 16:38:59 +01:00
xfrm.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-05-09 10:01:01 -07:00
xsk_buff_pool.h
xsk: use generic DMA sync shortcut instead of a custom one
2024-05-08 08:51:20 +02:00