From 82eaa3e6882f6e4e0b260f9b6ba9169fbfa3a7b1 Mon Sep 17 00:00:00 2001 From: Alexander Wetzel Date: Wed, 4 Mar 2020 18:16:51 +0100 Subject: [PATCH] Remove the not yet needed KEY_FLAG_MODIFY I decided to drop KEY_FLAG_MODIFY instead of allowing flag combinations not yet used in the code and will simply recreate it with the Extended Key ID patches once we get there. For that reason I also did not renumber the flags. Signed-off-by: Alexander Wetzel --- src/common/defs.h | 3 --- src/drivers/driver.h | 7 ------- 2 files changed, 10 deletions(-) diff --git a/src/common/defs.h b/src/common/defs.h index 6358c3158..66c9b1f84 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -431,7 +431,6 @@ enum chan_width { }; enum key_flag { - KEY_FLAG_MODIFY = BIT(0), KEY_FLAG_DEFAULT = BIT(1), KEY_FLAG_RX = BIT(2), KEY_FLAG_TX = BIT(3), @@ -448,8 +447,6 @@ enum key_flag { KEY_FLAG_DEFAULT, KEY_FLAG_PAIRWISE_RX_TX = KEY_FLAG_PAIRWISE | KEY_FLAG_RX_TX, KEY_FLAG_PAIRWISE_RX = KEY_FLAG_PAIRWISE | KEY_FLAG_RX, - KEY_FLAG_PAIRWISE_RX_TX_MODIFY = KEY_FLAG_PAIRWISE_RX_TX | - KEY_FLAG_MODIFY, }; enum ptk0_rekey_handling { diff --git a/src/drivers/driver.h b/src/drivers/driver.h index bb187b8bf..04a453ea8 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1609,10 +1609,6 @@ struct wpa_driver_set_key_params { /** * key_flag - Additional key flags * - * %KEY_FLAG_MODIFY - * Set when an already installed key must be updated. - * So far the only use-case is changing RX/TX status of - * installed keys. Must not be set when deleting a key. * %KEY_FLAG_DEFAULT * Set when the key is also a default key. Must not be set when * deleting a key. @@ -1641,9 +1637,6 @@ struct wpa_driver_set_key_params { * %KEY_FLAG_PAIRWISE_RX * Pairwise key not yet valid for TX. (Only usable when Extended * Key ID is supported by the driver.) - * %KEY_FLAG_PAIRWISE_RX_TX_MODIFY - * Enable TX for a pairwise key installed with - * KEY_FLAG_PAIRWISE_RX. * * Not a valid standalone key type but pre-defined to be combined * with other key_flags: