Re: [PATCH net-next v2] net: ieee802154: Fix compilation error when CONFIG_IEEE802154_NL802154_EXPERIMENTAL is disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




Hello Jabkub.

On 02.09.22 05:06, Jakub Kicinski wrote:
From: Gal Pressman <gal@xxxxxxxxxx>

When CONFIG_IEEE802154_NL802154_EXPERIMENTAL is disabled,
NL802154_CMD_DEL_SEC_LEVEL is undefined and results in a compilation
error:
net/ieee802154/nl802154.c:2503:19: error: 'NL802154_CMD_DEL_SEC_LEVEL' undeclared here (not in a function); did you mean 'NL802154_CMD_SET_CCA_ED_LEVEL'?
  2503 |  .resv_start_op = NL802154_CMD_DEL_SEC_LEVEL + 1,
       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
       |                   NL802154_CMD_SET_CCA_ED_LEVEL

Unhide the experimental commands, having them defined in an enum
makes no difference.

Fixes: 9c5d03d36251 ("genetlink: start to validate reserved header bytes")
Signed-off-by: Gal Pressman <gal@xxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
---
v1: /tmp/0001-net-ieee802154-Fix-compilation-error-when-CONFIG_IEE.patch
v2: unhide instead of changing the define used

CC: alex.aring@xxxxxxxxx
CC: stefan@xxxxxxxxxxxxxxxxxx
CC: paul@xxxxxxxxxxxxxx
CC: linux-wpan@xxxxxxxxxxxxxxx
---
  include/net/nl802154.h | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index 145acb8f2509..f5850b569c52 100644
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -58,9 +58,6 @@ enum nl802154_commands {
NL802154_CMD_SET_WPAN_PHY_NETNS, - /* add new commands above here */
-
-#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
  	NL802154_CMD_SET_SEC_PARAMS,
  	NL802154_CMD_GET_SEC_KEY,		/* can dump */
  	NL802154_CMD_NEW_SEC_KEY,
@@ -74,7 +71,8 @@ enum nl802154_commands {
  	NL802154_CMD_GET_SEC_LEVEL,		/* can dump */
  	NL802154_CMD_NEW_SEC_LEVEL,
  	NL802154_CMD_DEL_SEC_LEVEL,
-#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
+
+	/* add new commands above here */
/* used to define NL802154_CMD_MAX below */
  	__NL802154_CMD_AFTER_LAST,


Acked-by: Stefan Schmidt <stefan@xxxxxxxxxxxxxxxxxx>

Thanks for handling this! I will simply ack it as I assume you will take it directly instead of me taking it through my tree and adding delays.

regards
Stefan Schmidt



[Index of Archives]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux