upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-13 18:50:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net80211: crypto: ccmp: simplify and style(9)

Browse source 
Comply with style(9) and andd checks for booleaness when doing
bit tests.
If there is no need for double negated checks simplify them.
This all makes the conditions a lot easier to read.

Slip in a comment about MIC vs. MMIC.

No functional changes.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Reviewed by:	emaste, adrian
Differential Revision: https://reviews.freebsd.org/D49055
This commit is contained in:
Bjoern A. Zeeb 2025-01-27 13:54:02 +00:00
parent b59a0cde6a
commit 8dcdffdb08
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/net80211/ieee80211_crypto_ccmp.c
View file

@ -242,7 +242,7 @@ ccmp_decap(struct ieee80211_key *k, struct mbuf *m, int hdrlen)
rxs = ieee80211_get_rx_params_ptr(m);
if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))
if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP) != 0)
goto finish;
/*
@ -297,14 +297,15 @@ finish:
/*
* XXX TODO: see if MMIC_STRIP also covers CCMP MIC trailer.
* Well no as it's a MIC not MMIC but we re-use the same flag for now.
*/
if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP)))
if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP) == 0)
m_adj(m, -ccmp.ic_trailer);
/*
* Ok to update rsc now.
*/
if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP) == 0) {
/*
* Do not go backwards in the IEEE80211_KEY_NOREPLAY cases
* or in case hardware has checked but frames are arriving