From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 24 Aug 2017 03:02:54 +0000 (+0800)
Subject: Merge branch 'bugfix/ampdu_default_wifi_settings' into 'master'
X-Git-Tag: v3.1-dev~378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d42208ffe82742ab7ed0da5471b4b1eee1759a2c;p=esp-idf

Merge branch 'bugfix/ampdu_default_wifi_settings' into 'master'

wifi: Fix compilation error in WIFI_INIT_CONFIG_DEFAULT() if AMPDU disabled

See merge request !1139
---

d42208ffe82742ab7ed0da5471b4b1eee1759a2c