History

wifi: nl80211: ignore cluster id after NAN started

After NAN was started, cluster id updates from the user space should not happen, since the device already started a cluster with the previousely provided id. Since NL80211_CMD_CHANGE_NAN_CONFIG requires to set the full NAN configuration, we can't require that NL80211_NAN_CONF_CLUSTER_ID won't be included in this command, and keeping the last confgiured value just to be able to compare it against the new one seems a bit overkill. Therefore, just ignore cluster id in this command and clarify the documentation.

Miri Korenblit committed 10 months ago

Commit 8a429381 parent 36e83df2 files · +9 −6Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+3−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
1212 * Copyright 2008 Colin McCabe <colin@cozybit.com>
1313 * Copyright 2015-2017 Intel Deutschland GmbH
14− * Copyright (C) 2018-2025 Intel Corporation
14+ * Copyright (C) 2018-2026 Intel Corporation
1515 *
1616 * Permission to use, copy, modify, and/or distribute this software for any
1717 * purpose with or without fee is hereby granted, provided that the above
@@ -7454,6 +7454,8 @@ enum nl80211_nan_band_conf_attributes { · 7436 unmodified lines
74547454 * address that can take values from 50-6F-9A-01-00-00 to
74557455 * 50-6F-9A-01-FF-FF. This attribute is optional. If not present,
74567456 * a random Cluster ID will be chosen.
7457+ * This attribute will be ignored in NL80211_CMD_CHANGE_NAN_CONFIG
7458+ * since after NAN was started, the cluster ID can no longer change.
74577459 * @NL80211_NAN_CONF_EXTRA_ATTRS: Additional NAN attributes to be
74587460 * published in the beacons. This is an optional byte array.
74597461 * @NL80211_NAN_CONF_VENDOR_ELEMS: Vendor-specific elements that will