Merge branch 'bugfix/tw24347' into 'master'

feat(net80211): return ERR_MEM if malloc esp_buf fail See merge request sdk/ESP8266_NONOS_SDK!68
espressif · Nov 2, 2018 · 275e7e2 · 275e7e2
2 parents edbd2f1 + bf1bdc3
commit 275e7e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -3,8 +3,8 @@ gwen:
     crypto      :   25f7d60
     espnow      :   25f7d60
     json        :   25f7d60
-    main        :   2e60a7d
-    net80211    :   25f7d60
+    main        :   19b8d44
+    net80211    :   19b8d44
     pp          :   551aeee
     smartconfig :   25f7d60
     ssl         :   25f7d60

diff --git a/lib/libmain.a b/lib/libmain.a
diff --git a/lib/libnet80211.a b/lib/libnet80211.a