Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2218844/?format=api
{ "id": 2218844, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2218844/?format=api", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.0/projects/22/?format=api", "name": "HostAP Development", "link_name": "hostap", "list_id": "hostap.lists.infradead.org", "list_email": "hostap@lists.infradead.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260401220220.4418-53-andrei.otcheretianski@intel.com>", "date": "2026-04-01T22:02:01", "name": "[52/71] nl80211: Add support for sending NAN schedule commands", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b06e843e6f77d1deb5f20973e0fd8ef485e464a4", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.0/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260401220220.4418-53-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 498402, "url": "http://patchwork.ozlabs.org/api/1.0/series/498402/?format=api", "date": "2026-04-01T22:01:09", "name": "NAN Data Path and Bootstrapping support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498402/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218844/checks/", "tags": {}, "headers": { "Return-Path": "\n <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=NxiWnaon;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=LG+XGUsH;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmK0b6FYJz1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:09:51 +1100 (AEDT)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83kS-0000000GEoQ-2RgE;\n\tWed, 01 Apr 2026 22:09:16 +0000", "from mgamail.intel.com ([198.175.65.20])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hi-0000000G9s8-3Bxf\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:35 +0000", "from fmviesa003.fm.intel.com ([10.60.135.143])\n by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:06:06 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:06:06 -0700" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=RHepeS8iIGr6qyfNFGFPjGgERRlh15JPEh+w50NRCjQ=; b=NxiWnaon8HdiB9\n\teZ20T4SqUIL8M1bVKULY+PWxU3a4SOFBut3ij+zjQAWa4rQ7dixcZWDNCZGy73OGc1ufpn0V9CbDb\n\t56OJ6W/AAivekcEzlCzu/4FttPtaQroSlnUQD++fH0seg2ZfHEjVnTM8A09BXItPXly2te2ktzMwx\n\tzapPJ8cDtNPucxZzn6LmR2HYYz8dUbuBcIcHDbEmtUcoT19p7LbxXsoZJSOFZ6cwO8nfq9VxwlJnP\n\tlHrHN2HWI4VSyNDvdFA2UfqZeaDa7PpxzNew3B5Np0AGXZYepU+wRAFa6aMsusdYXOgLQJMyxjybU\n\tTECz/bWvD86dUqJ3oYUw==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081186; x=1806617186;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=/ZpiT0I2gjlAuWr00LmgE6ffhtWIYoOsQjjs+lcj6M4=;\n b=LG+XGUsHN6CxEURCRBgBJc/tPKxDTGVg6fcFBCBk/JhTiK/y4Nx1VjUM\n QqnsfB/hQpHycZxyet0ABgbSXoHELuhawp5s5mEVCQuxaTq2ydOrS+rtu\n 5PInNWDhFB0kAgrBmrQzcDy/L6BiS/H316fPm8sGBQ/bLYUrEEkjexsVM\n Lc9WZOYem0CSo1XCTHjbmLbcdalrV10zT5u8+uSy/wYriMBTNjBiJcqEp\n DKKPmr5MDWx8kWMw4cMglg/AFtM+F1Ky8SjB+Eh/nYyAnY2VHSVK5mg2y\n E6K8PS941hrM6Zu9qMHtc92KG7XvQQIWuiqnlDOFZ8+gqPexHVJiLXA7e\n Q==;" ], "X-CSE-ConnectionGUID": [ "pJo464E4QDSk/hy2BwnwOg==", "a9vWL4F+RaajtrWAdUxoxw==" ], "X-CSE-MsgGUID": [ "Tgs87Z4tSgWCXRgeJCKrFg==", "YSPXhN9oQkuiHhmIw8Ml6A==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11746\"; a=\"75851649\"", "E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851649\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Subject": "[PATCH 52/71] nl80211: Add support for sending NAN schedule commands", "Date": "Thu, 2 Apr 2026 01:02:01 +0300", "Message-ID": "<20260401220220.4418-53-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260401220220.4418-1-andrei.otcheretianski@intel.com>", "References": "<20260401220220.4418-1-andrei.otcheretianski@intel.com>", "MIME-Version": "1.0", "X-CRM114-Version": "20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ", "X-CRM114-CacheID": "sfid-20260401_150627_019323_571346C3 ", "X-CRM114-Status": "GOOD ( 20.10 )", "X-Spam-Score": "-1.9 (-)", "X-Spam-Report": "Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: Ilan Peer <ilan.peer@intel.com> Add support for\n configuring\n and sending: - NAN local schedule. - NAN peer schedule.\n Content analysis details: (-1.9 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,\n medium trust\n [198.175.65.20 listed in list.dnswl.org]\n 1.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in\n bl.score.senderscore.com]\n 1.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The\n query to Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in\n sa-trusted.bondedsender.org]\n 1.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in sa-accredit.habeas.com]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.5 DKIMWL_WL_HIGH DKIMwl.org - High trust sender", "X-BeenThere": "hostap@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "<hostap.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/hostap/>", "List-Post": "<mailto:hostap@lists.infradead.org>", "List-Help": "<mailto:hostap-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"Hostap\" <hostap-bounces@lists.infradead.org>", "Errors-To": "hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "From: Ilan Peer <ilan.peer@intel.com>\n\nAdd support for configuring and sending:\n\n- NAN local schedule.\n- NAN peer schedule.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/drivers/driver_nl80211.c | 365 +++++++++++++++++++++++++++++++++--\n 1 file changed, 345 insertions(+), 20 deletions(-)", "diff": "diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c\nindex 58f6e9632f..6869ccd4da 100644\n--- a/src/drivers/driver_nl80211.c\n+++ b/src/drivers/driver_nl80211.c\n@@ -5408,6 +5408,36 @@ err:\n #endif /* CONFIG_DRIVER_NL80211_QCA */\n \n \n+static int nl80211_bw_to_nl(int bw, enum nl80211_chan_width *cw,\n+\t\t\t int center_freq2)\n+{\n+\tswitch (bw) {\n+\tcase 20:\n+\t\t*cw = NL80211_CHAN_WIDTH_20;\n+\t\tbreak;\n+\tcase 40:\n+\t\t*cw = NL80211_CHAN_WIDTH_40;\n+\t\tbreak;\n+\tcase 80:\n+\t\tif (center_freq2)\n+\t\t\t*cw = NL80211_CHAN_WIDTH_80P80;\n+\t\telse\n+\t\t\t*cw = NL80211_CHAN_WIDTH_80;\n+\t\tbreak;\n+\tcase 160:\n+\t\t*cw = NL80211_CHAN_WIDTH_160;\n+\t\tbreak;\n+\tcase 320:\n+\t\t*cw = NL80211_CHAN_WIDTH_320;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n static int nl80211_put_freq_params(struct nl_msg *msg,\n \t\t\t\t const struct hostapd_freq_params *freq,\n \t\t\t\t struct i802_bss *bss)\n@@ -5434,28 +5464,16 @@ static int nl80211_put_freq_params(struct nl_msg *msg,\n \tif (freq->vht_enabled ||\n \t ((freq->he_enabled || freq->eht_enabled) && !is_24ghz)) {\n \t\tenum nl80211_chan_width cw;\n+\t\tint ret;\n \n \t\twpa_printf(MSG_DEBUG, \" * bandwidth=%d\", freq->bandwidth);\n-\t\tswitch (freq->bandwidth) {\n-\t\tcase 20:\n-\t\t\tcw = NL80211_CHAN_WIDTH_20;\n-\t\t\tbreak;\n-\t\tcase 40:\n-\t\t\tcw = NL80211_CHAN_WIDTH_40;\n-\t\t\tbreak;\n-\t\tcase 80:\n-\t\t\tif (freq->center_freq2)\n-\t\t\t\tcw = NL80211_CHAN_WIDTH_80P80;\n-\t\t\telse\n-\t\t\t\tcw = NL80211_CHAN_WIDTH_80;\n-\t\t\tbreak;\n-\t\tcase 160:\n-\t\t\tcw = NL80211_CHAN_WIDTH_160;\n-\t\t\tbreak;\n-\t\tcase 320:\n-\t\t\tcw = NL80211_CHAN_WIDTH_320;\n-\t\t\tbreak;\n-\t\tdefault:\n+\t\tret = nl80211_bw_to_nl(freq->bandwidth, &cw,\n+\t\t\t\t freq->center_freq2);\n+\n+\t\tif (ret < 0) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \" * Unsupported bandwidth %d MHz\",\n+\t\t\t\t freq->bandwidth);\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -15514,6 +15532,311 @@ static void wpa_driver_nl80211_nan_stop(void *priv)\n \tnl80211_nan_stop(bss);\n }\n \n+\n+static int\n+wpa_driver_nl80211_nan_set_channel(struct wpa_driver_nl80211_data *drv,\n+\t\t\t\t struct nan_schedule_channel *chan,\n+\t\t\t\t struct nl_msg *msg)\n+{\n+\tstruct nlattr *chan_attr;\n+\tenum nl80211_chan_width cw;\n+\tint ret;\n+\n+\tchan_attr = nla_nest_start(msg, NL80211_ATTR_NAN_CHANNEL);\n+\tif (!chan)\n+\t\treturn -ENOBUFS;\n+\n+\tret = nl80211_bw_to_nl(chan->bandwidth, &cw, chan->center_freq2);\n+\tif (ret)\n+\t\treturn -EINVAL;\n+\n+\tif (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, chan->freq) ||\n+\t nla_put_u32(msg, NL80211_ATTR_CENTER_FREQ1, chan->center_freq1) ||\n+\t nla_put_u32(msg, NL80211_ATTR_CENTER_FREQ2, chan->center_freq2) ||\n+\t nla_put_u32(msg, NL80211_ATTR_CHANNEL_WIDTH, cw) ||\n+\t nla_put(msg, NL80211_ATTR_NAN_CHANNEL_ENTRY,\n+\t\t sizeof(chan->chan_entry), chan->chan_entry)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"nl80211: NAN: Failed to put channel attributes\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (chan->rx_nss &&\n+\t nla_put_u8(msg, NL80211_ATTR_NAN_RX_NSS, chan->rx_nss)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"nl80211: NAN: Failed to put RX NSS attribute\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tnla_nest_end(msg, chan_attr);\n+\treturn 0;\n+}\n+\n+\n+static int\n+wpa_driver_nl80211_nan_set_slots(struct wpa_driver_nl80211_data *drv,\n+\t\t\t\t struct wpabuf *chan_time_bitmap,\n+\t\t\t\t u8 *slots, u8 chan_idx)\n+{\n+\tconst u8 *time_bitmap;\n+\tsize_t time_bitmap_len, idx;\n+\n+\tif (!chan_time_bitmap)\n+\t\treturn 0;\n+\n+\ttime_bitmap = wpabuf_head(chan_time_bitmap);\n+\ttime_bitmap_len = wpabuf_len(chan_time_bitmap);\n+\tif (!time_bitmap || !time_bitmap_len)\n+\t\treturn 0;\n+\n+\t/*\n+\t * nl80211 always uses a period of 512 TUs with slot duration of\n+\t * 16 TUs, so the map length must be equal to 4\n+\t */\n+\tif (time_bitmap_len != 4) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"nl80211: NAN: Invalid time bitmap len=%zu\",\n+\t\t\t time_bitmap_len);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (idx = 0; idx < time_bitmap_len * 8; idx++) {\n+\t\tsize_t byte_idx = idx / 8;\n+\t\tsize_t bit_idx = idx % 8;\n+\n+\t\tif (time_bitmap[byte_idx] & BIT(bit_idx))\n+\t\t\tslots[idx] = chan_idx;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n+static int\n+wpa_driver_nl80211_nan_set_schedule(struct wpa_driver_nl80211_data *drv,\n+\t\t\t\t struct nan_schedule_config *sched,\n+\t\t\t\t struct nl_msg *msg)\n+{\n+\tu8 slots[32];\n+\tsize_t i;\n+\n+\tos_memset(slots, NL80211_NAN_SCHED_NOT_AVAIL_SLOT, sizeof(slots));\n+\n+\tfor (i = 0; i < sched->num_channels; i++) {\n+\t\tint ret = wpa_driver_nl80211_nan_set_channel(drv,\n+\t\t\t\t\t\t\t &sched->channels[i],\n+\t\t\t\t\t\t\t msg);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tret = wpa_driver_nl80211_nan_set_slots(drv,\n+\t\t\t\t\t\t sched->channels[i].time_bitmap,\n+\t\t\t\t\t\t slots, i);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\treturn nla_put(msg, NL80211_ATTR_NAN_TIME_SLOTS, sizeof(slots), slots);\n+}\n+\n+\n+static int\n+wpa_driver_nl80211_nan_config_schedule(void *priv, u8 map_id,\n+\t\t\t\t struct nan_schedule_config *sched)\n+{\n+\tstruct i802_bss *bss = priv;\n+\tstruct wpa_driver_nl80211_data *drv = bss->drv;\n+\tstruct nl_msg *msg;\n+\tint ret;\n+\n+\tif (drv->nlmode != NL80211_IFTYPE_NAN || !drv->nan_started)\n+\t\treturn -EOPNOTSUPP;\n+\n+\tif (!sched)\n+\t\treturn -EINVAL;\n+\n+\tmsg = nl80211_cmd_msg(bss, 0, NL80211_CMD_NAN_SET_LOCAL_SCHED);\n+\tif (!msg) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"nl80211: Failed to alloc NAN local schedule command\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tret = wpa_driver_nl80211_nan_set_schedule(drv, sched, msg);\n+\tif (ret)\n+\t\tgoto fail;\n+\n+\tif (sched->avail_attr &&\n+\t nl80211_attr_supported(drv, NL80211_ATTR_NAN_AVAIL_BLOB) &&\n+\t nla_put(msg, NL80211_ATTR_NAN_AVAIL_BLOB,\n+\t\t wpabuf_len(sched->avail_attr),\n+\t\t wpabuf_head(sched->avail_attr)))\n+\t\tgoto fail;\n+\n+\tret = send_and_recv_cmd(bss->drv, msg);\n+\tif (ret)\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"nl80211: Failed to send NAN local schedule command: %d\",\n+\t\t\t ret);\n+\n+\treturn ret;\n+\n+fail:\n+\tnlmsg_free(msg);\n+\treturn -ENOBUFS;\n+}\n+\n+\n+static int\n+wpa_driver_nl80211_nan_config_peer_schedule(void *priv, const u8 *peer,\n+\t\t\t\t\t u16 cdw, u8 sequence_id,\n+\t\t\t\t\t u16 max_chan_switch_time,\n+\t\t\t\t\t const struct wpabuf *ulw,\n+\t\t\t\t\t struct nan_peer_schedule_config *sched)\n+{\n+\tstruct i802_bss *bss = priv;\n+\tstruct wpa_driver_nl80211_data *drv = bss->drv;\n+\tstruct nan_schedule_channel *channels[MAX_NUM_NAN_MAPS * MAX_NUM_NAN_SCHEDULE_CHANNELS];\n+\tu8 chan_remap[MAX_NUM_NAN_MAPS][MAX_NUM_NAN_SCHEDULE_CHANNELS];\n+\tsize_t map_idx, chan_idx, n_channels = 0;\n+\tstruct nl_msg *msg;\n+\tstruct nlattr *maps;\n+\tint ret;\n+\n+\tif (drv->nlmode != NL80211_IFTYPE_NAN || !drv->nan_started)\n+\t\treturn -EOPNOTSUPP;\n+\n+\tif (!sched)\n+\t\treturn -EINVAL;\n+\n+\tos_memset(channels, 0, sizeof(channels));\n+\tos_memset(chan_remap, 0, sizeof(chan_remap));\n+\n+\t/*\n+\t * Kernel expects channels at the top level, and peer maps reference\n+\t * them by index. Build a global channel list from all maps.\n+\t */\n+\tfor (map_idx = 0; map_idx < sched->n_maps; map_idx++) {\n+\t\tstruct nan_schedule_map *map = &sched->maps[map_idx];\n+\n+\t\tfor (chan_idx = 0; chan_idx < map->sched.num_channels;\n+\t\t chan_idx++) {\n+\t\t\tsize_t i;\n+\n+\t\t\t/* Check if we already have this channel */\n+\t\t\tfor (i = 0; i < n_channels; i++) {\n+\t\t\t\tif (os_memcmp(&map->sched.channels[chan_idx].chan_entry,\n+\t\t\t\t\t channels[i]->chan_entry,\n+\t\t\t\t\t sizeof(channels[i]->chan_entry)) == 0)\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\tif (i < n_channels) {\n+\t\t\t\tchan_remap[map_idx][chan_idx] = i;\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\tchannels[n_channels] = &map->sched.channels[chan_idx];\n+\t\t\tchan_remap[map_idx][chan_idx] = n_channels++;\n+\t\t}\n+\t}\n+\n+\tmsg = nl80211_cmd_msg(bss, 0, NL80211_CMD_NAN_SET_PEER_SCHED);\n+\tif (!msg) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"nl80211: Failed to alloc NAN peer schedule command\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tif (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer) ||\n+\t nla_put_u16(msg, NL80211_ATTR_NAN_COMMITTED_DW, cdw) ||\n+\t nla_put_u16(msg, NL80211_ATTR_NAN_MAX_CHAN_SWITCH_TIME,\n+\t\t\tmax_chan_switch_time) ||\n+\t (sched->n_maps &&\n+\t nla_put_u8(msg, NL80211_ATTR_NAN_SEQ_ID, sequence_id))) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"nl80211: NAN: Failed to put peer schedule attributes\");\n+\t\tgoto fail;\n+\t}\n+\n+\tif (ulw && wpabuf_len(ulw)) {\n+\t\tif (nla_put(msg, NL80211_ATTR_NAN_ULW,\n+\t\t\t wpabuf_len(ulw), wpabuf_head(ulw))) {\n+\t\t\twpa_printf(MSG_ERROR,\n+\t\t\t\t \"nl80211: NAN: Failed to put ULW attribute\");\n+\t\t\tgoto fail;\n+\t\t}\n+\t}\n+\n+\t/* Set the channels */\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"nl80211: NAN: Setting %zu channels for peer schedule\",\n+\t\t n_channels);\n+\n+\tfor (chan_idx = 0; chan_idx < n_channels; chan_idx++) {\n+\t\tret = wpa_driver_nl80211_nan_set_channel(drv,\n+\t\t\t\t\t\t\t channels[chan_idx],\n+\t\t\t\t\t\t\t msg);\n+\t\tif (ret)\n+\t\t\tgoto fail;\n+\t}\n+\n+\t/* Set the maps */\n+\tmaps = nla_nest_start(msg, NL80211_ATTR_NAN_PEER_MAPS);\n+\tif (!maps)\n+\t\tgoto fail;\n+\n+\tfor (map_idx = 0; map_idx < sched->n_maps; map_idx++) {\n+\t\tstruct nlattr *map = nla_nest_start(msg, map_idx + 1);\n+\t\tu8 slots[32];\n+\n+\t\tif (!map)\n+\t\t\tgoto fail;\n+\n+\t\tif (nla_put_u8(msg, NL80211_NAN_PEER_MAP_ATTR_MAP_ID,\n+\t\t\t sched->maps[map_idx].map_id))\n+\t\t\tgoto fail;\n+\n+\t\tos_memset(slots, NL80211_NAN_SCHED_NOT_AVAIL_SLOT,\n+\t\t\t sizeof(slots));\n+\n+\t\tfor (chan_idx = 0;\n+\t\t chan_idx < sched->maps[map_idx].sched.num_channels;\n+\t\t chan_idx++) {\n+\t\t\tstruct nan_schedule_channel *chan =\n+\t\t\t\t&sched->maps[map_idx].sched.channels[chan_idx];\n+\n+\t\t\tret = wpa_driver_nl80211_nan_set_slots(drv,\n+\t\t\t\t\t\t\t chan->time_bitmap,\n+\t\t\t\t\t\t\t slots,\n+\t\t\t\t\t\t\t chan_remap[map_idx][chan_idx]);\n+\t\t\tif (ret)\n+\t\t\t\tgoto fail;\n+\t\t}\n+\n+\t\tif (nla_put(msg, NL80211_NAN_PEER_MAP_ATTR_TIME_SLOTS,\n+\t\t\t sizeof(slots), slots))\n+\t\t\tgoto fail;\n+\n+\t\tnla_nest_end(msg, map);\n+\t}\n+\n+\tnla_nest_end(msg, maps);\n+\n+\tret = send_and_recv_cmd(bss->drv, msg);\n+\tif (ret)\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"nl80211: Failed to send NAN peer schedule command: %d\",\n+\t\t\t ret);\n+\n+\treturn ret;\n+\n+fail:\n+\tnlmsg_free(msg);\n+\treturn -ENOBUFS;\n+}\n+\n+\n #endif /* CONFIG_NAN */\n \n \n@@ -15692,5 +16015,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {\n \t.nan_start = wpa_driver_nl80211_nan_start,\n \t.nan_stop = wpa_driver_nl80211_nan_stop,\n \t.nan_change_config = wpa_driver_nl80211_nan_change_config,\n+\t.nan_config_schedule = wpa_driver_nl80211_nan_config_schedule,\n+\t.nan_config_peer_schedule = wpa_driver_nl80211_nan_config_peer_schedule,\n #endif /* CONFIG_NAN */\n };\n", "prefixes": [ "52/71" ] }