From ce7df37132fd9e57d4783e7ee81c723bc4d19c0b Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 7 May 2019 12:46:48 -0700 Subject: [PATCH] netdev: remove in_ft checks and set_use_eapol_start In both netdev_{authenticate,associate}_event there is no need to check for in_ft at the start since netdev->ap will always be set if in_ft is set. There was also no need to set eapol_sm_set_use_eapol_start, as setting require_handshake implies this and achieves the same result when starting the SM. --- src/netdev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index 1a7e63ba..1c2bf7ad 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -1859,7 +1859,7 @@ static void netdev_authenticate_event(struct l_genl_msg *msg, * the FT Associate command is included in the attached frame and is * not available in the Authenticate command callback. */ - if (!netdev->in_ft && !netdev->ap) + if (!netdev->ap) return; if (!l_genl_attr_init(&attr, msg)) { @@ -1925,7 +1925,7 @@ static void netdev_associate_event(struct l_genl_msg *msg, if (!netdev->connected || netdev->aborting) return; - if (!netdev->in_ft && !netdev->handshake->mde && !netdev->ap) + if (!netdev->ap) return; if (!l_genl_attr_init(&attr, msg)) { @@ -1973,7 +1973,6 @@ static void netdev_associate_event(struct l_genl_msg *msg, if (netdev->in_ft) { eapol_sm_set_require_handshake(netdev->sm, false); - eapol_sm_set_use_eapol_start(netdev->sm, false); netdev->in_ft = false; }