Hi Johannes, Since commit a442b761b24b ("cfg80211: add add_nan_func / del_nan_func") there is a cookie_counter in the wiphy object. It is only used by the add_nan_func now, but do we want to consolidate all cookie returning functions to use this cookie counter, eg. in .remain_on_channel callback. Regards, Arend