Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec
f5728d0 nl80211: Fix segfault when params->freq is NULL for AP mode start
3388e7b mesh: Remove HT IEs if HT is disabled
4ac2ea5 mesh: Make DTIM period configurable
fac72f9 mesh: Stop joining to different frequency network
7035162 mesh: Join an existing MBSS instead of creating a new one
58fe015 gitignore static library files
0f282c7 P2Ps: Clear existing value when peer stops sending adv_service_instance
4d7aab7 Make driver flags available through control interface
77d468e P2P: Cleanup by removing unnecessary os_free() call from p2p_deinit()
e347caf mesh: Report mesh peer AID to kernel
e3227c3 Sync with mac80211-next.git include/uapi/linux/nl80211.h
6c34b9c Assign QCA vendor attribute for setting TX fail count threshold
52fec36 Assign QCA vendor attributes for set retry configuration
1c8fe68 QCA vendor command to configure conditional switch channel for AP
34a5014 MBO: Remove unused assignment
f8608fa SME: Fix SA Query local failure handling
ab6ab07 Clear wpa_s->sme.last_unprot_disconnect.sec on FLUSH command
9636b07 HS 2.0: Add an event message to note failed OSU provider write
460e5cd OpenSSL: Fix OpenSSL 1.1.0 DH operation
dd20eab HS 2.0: Add optional no-scan parameter to FETCH_OSU
f465c32 Interworking: Define control interface message prefixes in wpa_ctrl.h
99a9423 HS 2.0: Make hs20_build_anqp_req() static
75b2a87 HS 2.0: Fix hs20_get_icon() error path
0da9869 Interworking: Remove unused allow_excluded from interworking_connect()
8329ad4 Fix wpa_config_get_all() error path
f7c04e5 Interworking: Combine identical error returns into a single one
a6f5b19 P2P: Allow P2P listen being offloaded to the driver/firmware
35d6655 nl80211: P2P Listen offload vendor command definitions
ef60f64 Do not exceed scan ssid max size advertised by driver
4ac5f2f Add text name for WPA_KEY_MGMT_WPA_NONE key_mgmt value
f0e8405 nl80211: Provide frequency in EVENT_ASSOC when IBSS is joined
653d227 MBO: Improve supported operating class generation
9607a1a nl80211: Keep QCA vendor extensions together
8bd9099 mesh: Add debug prints on my/peer lid mismatches
78ac368 mesh: Add MPM FSM transitions from ESTAB to HOLDING for {OPN,CNF}_RJCT
0202256 mesh: Update MPM FSM events to match the standard
d02e549 mesh: Rename MPM FSM states to match the standard
1f2f3f1 mesh: Indicate OPN_RJCT event if AES-SIV decrypt fails
e8afaad mesh: Write close reason from Mesh Peering Close to debug log
ee0ad45 mesh: Remove GTKdata and IGTKdata from Mesh Peering Confirm/Close
Change-Id: Ia720dc2e4db8539d566cbc826a5c6cfd26f169e1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
index d6295b2..299b8bb 100644
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -1184,6 +1184,8 @@
"WPA2-PSK" : "WPA-PSK";
case WPA_KEY_MGMT_NONE:
return "NONE";
+ case WPA_KEY_MGMT_WPA_NONE:
+ return "WPA-NONE";
case WPA_KEY_MGMT_IEEE8021X_NO_WPA:
return "IEEE 802.1X (no WPA)";
#ifdef CONFIG_IEEE80211R