diff mbox series

[1/2] nl80211,wpa_supplicant: Drop outdated tdls hack

Message ID 20200305210646.11616-1-alexander@wetzel-home.de
State Accepted
Headers show
Series [1/2] nl80211,wpa_supplicant: Drop outdated tdls hack | expand

Commit Message

Alexander Wetzel March 5, 2020, 9:06 p.m. UTC 
wpa_tdls_set_key() did set the key_id to -1 to avoid an useless
NL80211_CMD_SET_KEY call the updated nl80211 driver no longer carries
out anyhow.
Remove the no longer required workaround.

Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
---
 src/drivers/driver_nl80211.c | 5 +----
 src/rsn_supp/tdls.c          | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Jouni Malinen March 6, 2020, 9:11 p.m. UTC | #1 
On Thu, Mar 05, 2020 at 10:06:45PM +0100, Alexander Wetzel wrote:
> wpa_tdls_set_key() did set the key_id to -1 to avoid an useless
> NL80211_CMD_SET_KEY call the updated nl80211 driver no longer carries
> out anyhow.
> Remove the no longer required workaround.

Thanks, both patches applied.
diff mbox series

Patch

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index e56ae9fca..f44209db0 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3077,10 +3077,7 @@  static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
 		   "set_tx=%d seq_len=%lu key_len=%lu key_flag=0x%x",
 		   __func__, ifindex, ifname, alg, addr, key_idx, set_tx,
 		   (unsigned long) seq_len, (unsigned long) key_len, key_flag);
-#ifdef CONFIG_TDLS
-	if (key_idx == -1)
-		key_idx = 0;
-#endif /* CONFIG_TDLS */
+
 	if (check_key_flag(key_flag)) {
 		wpa_printf(MSG_DEBUG, "%s: invalid key_flag", __func__);
 		return -EINVAL;
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index bb8973942..7b47e3ac5 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -227,7 +227,7 @@  static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
 
 	wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
 		   MAC2STR(peer->addr));
-	if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, rsc, sizeof(rsc),
+	if (wpa_sm_set_key(sm, alg, peer->addr, 0, 1, rsc, sizeof(rsc),
 			   peer->tpk.tk, key_len,
 			   KEY_FLAG_PAIRWISE_RX_TX) < 0) {
 		wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "