libertas: fix WPA adhoc network creation

Oddly enough, the firmware's JOIN/START commands don't appear to have
any facility for setting custom IEs, thus the started adhoc network
doesn't advertise its WPA capability in the beacon.  Whee!

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index cb737207d208..b9b374119033 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -711,11 +711,13 @@ static int lbs_adhoc_start(struct lbs_private *priv,
 
         /* set capability info */
         tmpcap = WLAN_CAPABILITY_IBSS;
-        if (assoc_req->secinfo.wep_enabled) {
-                lbs_deb_join("ADHOC_START: WEP enabled, setting privacy on\n");
+        if (assoc_req->secinfo.wep_enabled ||
+            assoc_req->secinfo.WPAenabled ||
+            assoc_req->secinfo.WPA2enabled) {
+                lbs_deb_join("ADHOC_START: WEP/WPA enabled, privacy on\n");
                 tmpcap |= WLAN_CAPABILITY_PRIVACY;
         } else
-                lbs_deb_join("ADHOC_START: WEP disabled, setting privacy off\n");
+                lbs_deb_join("ADHOC_START: WEP disabled, privacy off\n");
 
         cmd.capability = cpu_to_le16(tmpcap);