From c1ab7f42d79604a1be2d680cdb37ffb88f0c30e3 Mon Sep 17 00:00:00 2001
From: Nicolas Cavallari <Nicolas.Cavallari@lri.fr>
Date: Wed, 11 Jan 2012 16:44:50 +0100
Subject: [PATCH] --- yaml --- r: 289952 b: refs/heads/master c:
 e2d75c136f8df4a4e28ece75c475a65b9292729a h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b4dfd24865fd..4ec1858502ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efa6a09db6d6c27557fb55299b9835b45b968eae
+refs/heads/master: e2d75c136f8df4a4e28ece75c475a65b9292729a
diff --git a/trunk/drivers/net/wireless/ath/carl9170/main.c b/trunk/drivers/net/wireless/ath/carl9170/main.c
index db774212161b..4dfb0290b43a 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/main.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/main.c
@@ -1796,6 +1796,9 @@ void *carl9170_alloc(size_t priv_size)
 		ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */
 
 	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+	/* As IBSS Encryption is software-based, IBSS RSN is supported. */
+	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 	return ar;
 
 err_nomem: