mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-22 06:29:23 +01:00
netdev: Simplify FILS handling in netdev_connect_common
This commit is contained in:
parent
be7b19d587
commit
7ee7848a96
18
src/netdev.c
18
src/netdev.c
@ -3833,6 +3833,14 @@ static void netdev_connect_common(struct netdev *netdev,
|
|||||||
goto build_cmd_connect;
|
goto build_cmd_connect;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IE_AKM_IS_FILS(hs->akm_suite)) {
|
||||||
|
netdev->ap = fils_sm_new(hs, netdev_fils_tx_authenticate,
|
||||||
|
netdev_fils_tx_associate,
|
||||||
|
netdev_get_oci,
|
||||||
|
netdev);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
if (nhs->type != CONNECTION_TYPE_SOFTMAC)
|
if (nhs->type != CONNECTION_TYPE_SOFTMAC)
|
||||||
goto build_cmd_connect;
|
goto build_cmd_connect;
|
||||||
|
|
||||||
@ -3855,15 +3863,6 @@ static void netdev_connect_common(struct netdev *netdev,
|
|||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case IE_RSN_AKM_SUITE_FILS_SHA256:
|
|
||||||
case IE_RSN_AKM_SUITE_FILS_SHA384:
|
|
||||||
case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256:
|
|
||||||
case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384:
|
|
||||||
netdev->ap = fils_sm_new(hs, netdev_fils_tx_authenticate,
|
|
||||||
netdev_fils_tx_associate,
|
|
||||||
netdev_get_oci,
|
|
||||||
netdev);
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
build_cmd_connect:
|
build_cmd_connect:
|
||||||
cmd_connect = netdev_build_cmd_connect(netdev, hs, prev_bssid);
|
cmd_connect = netdev_build_cmd_connect(netdev, hs, prev_bssid);
|
||||||
@ -3876,6 +3875,7 @@ build_cmd_connect:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
done:
|
||||||
netdev->connect_cmd = cmd_connect;
|
netdev->connect_cmd = cmd_connect;
|
||||||
netdev->event_filter = event_filter;
|
netdev->event_filter = event_filter;
|
||||||
netdev->connect_cb = cb;
|
netdev->connect_cb = cb;
|
||||||
|
Loading…
Reference in New Issue
Block a user