prima wlan: Revision 3.2.6.117
prima: fix compile errors and caf merge errors