Skip to content

brcmfmac: Fix 802.1x #5969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

brcmfmac: Fix 802.1x #5969

wants to merge 2 commits into from

Conversation

iucoen
Copy link
Contributor

@iucoen iucoen commented Feb 20, 2024

Commit 7d239fb broke 802.1X authentication by setting profile->use_fwsup = NONE whenever PSK is not used. However 802.1X does not use PSK and requires profile->use_fwsup set to 1X, or brcmf_cfg80211_set_pmk() fails. Fix this by also checking for if 802.1X is wanted.

Fixes: 7d239fb (brcmfmac: Fix interoperating DPP and other encryption network access
Fixes: #5964

Commit 7d239fb broke 802.1X authentication by setting
profile->use_fwsup = NONE whenever PSK is not used. However
802.1X does not use PSK and requires profile->use_fwsup set
to 1X, or brcmf_cfg80211_set_pmk() fails. Fix this by also
checking for if 802.1X is wanted.

Fixes: 7d239fb (brcmfmac: Fix interoperating DPP and other encryption network access
Fixes: raspberrypi#5964
@pelwell
Copy link
Contributor

pelwell commented Feb 20, 2024

This makes sense - good job - but I'd like to change the test from if (!sme->want_1x) to if (profile->use_fwsup != BRCMF_PROFILE_FWSUP_1X) - it's more like the block of code above, and I think makes it clearer what the value of use_fwsup will be in each case.

@iucoen
Copy link
Contributor Author

iucoen commented Feb 20, 2024

I'll squash the commits and create a new PR.

@iucoen iucoen closed this Feb 20, 2024
@pelwell
Copy link
Contributor

pelwell commented Feb 20, 2024

That's fine, but FYI we get the option to squash into a single commit on merge. The alternative would have been to squash locally and "git push -f" to the same github branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants