[openwrt/openwrt] hostapd: wpa_supplicant: Enable proper GCMP cipher support

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f246dfde3386ed4447afe080265ec75440ed5485

commit f246dfde3386ed4447afe080265ec75440ed5485
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Sun Mar 17 21:01:17 2019 +0100

    hostapd: wpa_supplicant: Enable proper GCMP cipher support
    
    This patch enables hostapd.sh to properly configure wpa_supplicant
    for when GCMP is used as cipher in station mode.
    Without this wpa_supplicant will be unable to connect to AP.
    This is needed for wil6210 as it does not support CCMP.
    
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/network/services/hostapd/Makefile         | 2 +-
 package/network/services/hostapd/files/hostapd.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index f746f5455a..8e9605fe68 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 80e1f7cedf..0f6741336b 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -1312,6 +1312,11 @@ wpa_supplicant_add_network() {
 		;;
 	esac
 
+	[ "$wpa_cipher" = GCMP ] && {
+		append network_data "pairwise=GCMP" "$N$T"
+		append network_data "group=GCMP" "$N$T"
+	}
+
 	[ "$mode" = mesh ] || {
 		case "$wpa" in
 			1)