FIPS validated WiFi for CMMC

I wonder if there are any DoD contracts here working through the CMMC requirements. If so, I am wondering if and how you are dealing with FIPS validated WiFi to transmit CUI. We have plant-wide WiFi, and all shop employees have Surface tablets to access Epicor, technical drawings, and our file server. All of which storage CUI, requiring the APs to be approved for FIPs.

We purchased a new SonicWall firewall and WiFi last year, and I’ve been working with SonicWall tech support to get this set up correctly for over a year now without any luck. As I research other options, I realize the SonicWall APs are not listed on the NIST CMPV. If I stick with the SonicWall solution, it appears my only options are forcing every wireless connection to use the SonicWall SSL NetExtender or RPD. Neither of these seems end-user-friendly…