Changes in mac80211_hwsim_i.h

a6ea8948e3c3ebec6146655e868e85b8613260eb - wifi: mac80211_hwsim: implement NAN schedule callbacks

Wed, 06 May 2026 05:44:27 +0200

wifi: mac80211_hwsim: implement NAN schedule callbacksImplement mac80211 schedule callbacks for NAN Data Path support:- Track local schedule via BSS_CHANGED_NAN_LOCAL_SCHED, caching the channel for each 16TU time slot.- Copy peer schedule to driver-private storage in nan_peer_sched_changed callback for use in TX availability decisions.Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260506064301.f3ad9e3dc9d4.I75cf3555b7506d5b8bb30e70a0f3721ab73477cb@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

29de2775e040a82398245d53c39eca4f7c45f74c - wifi: mac80211_hwsim: add NAN_DATA interface limits

Wed, 06 May 2026 05:44:25 +0200

wifi: mac80211_hwsim: add NAN_DATA interface limitsIncrease interface limits for NAN_DATA interface.Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260506064301.587955b23089.I261b782e5c198726b9465815d59ce037f094784d@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

42d3002bc323e2a87501e704350dd40c78a2d30f - wifi: mac80211_hwsim: implement NAN synchronization

Wed, 06 May 2026 05:44:24 +0200

wifi: mac80211_hwsim: implement NAN synchronizationAdd all the handling to do NAN synchronization on 2.4 GHz includingsending out beacons. With this, the mac80211_hwsim NAN device also workswhen used in conjunction with an external medium simulation.Note that the TSF sync is not ideal in case of an external mediumsimulation. This is because the mactime for received frames needs to beestimated and the simulation may not update the timestamp of beaconsto the actual time that the frame was transmitted.The implementation has an initial short phase where it scans forclusters. This facilitates cluster joining and avoids creating a newcluster immediately, which would result in two cluster joinnotifications. It does not scan otherwise and will only see anothercluster appearing if a discovery beacon happens to be sent during the2.4 GHz discovery window (DW).Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260506064301.7d21c3cdc565.I98b6c15eadefd6d123658294ef1a0cd3c2ce3054@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

d7b0798fc83be3b46d2ddd4c7dd257c271210296 - wifi: mac80211_hwsim: protect tsf_offset using a spinlock

Wed, 06 May 2026 05:44:23 +0200

wifi: mac80211_hwsim: protect tsf_offset using a spinlockTo implement NAN synchronization in hwsim, the TSF needs to be adjustedregularly from the RX path. Add a spinlock so that this can be done in asafe manner.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260506064301.18f36f264eb9.I0da5477220b896e2177bd521f7d9a8f2595631e6@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

f9aeb3a234ebc1205fcb9eafc792a1049193d709 - wifi: mac80211_hwsim: limit TX of frames to the NAN DW

Wed, 06 May 2026 05:44:20 +0200

wifi: mac80211_hwsim: limit TX of frames to the NAN DWFrames submitted on the NAN device interface should only be transmittedduring one of the discovery windows (DWs). It is assumed that softwaresubmits frames from the DW end notifications for the next DW period.Simulate this behaviour by checking that we are currently in a DW beforetransmitting from ieee80211_hwsim_wake_tx_queue. As frames will bequeued up at the start of a DW, wake the management TX queue every timea DW is started. Do so with a randomized offset just to avoid everyclient transmitting at the same time.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260506064301.f3456f159655.Id6780e2f7f7cab03264299b7d696ba5b1269e451@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

df0cb6e2446f55472260af6463e9ec4cd25a2cfa - wifi: mac80211_hwsim: refactor NAN timer handling

Mon, 04 May 2026 09:20:54 +0200

wifi: mac80211_hwsim: refactor NAN timer handlingRefactor the NAN timer to more closely track the where in the NANschedule the device currently is. Do this by having an hrtimer thatfires at the start of every slot.For now continue to update the current channel at the start of the DW.In the future, the correct channel according to the schedule should beused everywhere.This is in preparation to more accurately simulate more of the NANlogic.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260504101829.feb8e02b234e.I46da3cabea8624ba2e6c91bd2afecd2dc6553c5a@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

933f5bec98a123be286825e27e1186f829883519 - wifi: mac80211_hwsim: register beacon timer by calculating TBTT

Mon, 04 May 2026 09:20:53 +0200

wifi: mac80211_hwsim: register beacon timer by calculating TBTTIt is easy to calculate the next target beacon transmission time (TBTT)based on the current TSF and the beacon interval. Use this method tocalculate the time to the next beacon.With this, the bcn_delta variable can be removed and drift over time dueto the timer firing late is fully avoided.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260504101829.cc6f099ae2ac.Iccf6164f3feeb5350fcfe0df666248c686b226ae@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

e75129031f1ca727b029bf33afdc544f0e81d5ac - wifi: mac80211_hwsim: move timestamp writing later in the datapath

Mon, 04 May 2026 09:20:52 +0200

wifi: mac80211_hwsim: move timestamp writing later in the datapathBy delegating writing the timestamp into beacons and probe responses, wecan remove the abs_bcn_ts from the global data and still avoid any timeoffset issues. This also seems conceptually closer to "real" hardwarewhere the timestamp will be written late in the TX path.Move sending the SKB to the monitor interface to happen later, so thatthe frame timestamp has the value filled in by mac80211_hwsim.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260504101829.ad4d77d85e0d.I86810bbbf9b171acc6dbf07f9904ce1686b5167a@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h

340f2ab83a5c9fc76a045cac737a1533d19188ef - wifi: mac80211_hwsim: split NAN handling into separate file

Mon, 04 May 2026 09:20:50 +0200

wifi: mac80211_hwsim: split NAN handling into separate fileHaving everything in one file for mac80211_hwsim is starting to get alot and it will be even worse if we implement more parts of NAN. Splitthe NAN implementation into separate files to improve the codestructuring.Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260504101829.541371b35f02.I9484d746286eb2ab71ac987dfb907497d213c2bb@changeidSigned-off-by: Johannes Berg List of files: /linux/drivers/net/wireless/virtual/mac80211_hwsim_i.h