From 68d048a53c5b2040483f61e4daa9b4731a56aa73 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 22 May 2009 20:09:58 -0400 Subject: [PATCH] --- yaml --- r: 150645 b: refs/heads/master c: 2fa7a98fc96abe431e5d54d97104cdca197391fa h: refs/heads/master i: 150643: c76cfaa0a62d0a61d391395789736b856601bdf6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/assoc.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4b9710feeabe..d63904595cf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 822ac03a07cc9e714727a6d49ea050b92483f82a +refs/heads/master: 2fa7a98fc96abe431e5d54d97104cdca197391fa diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c index cb737207d208..b9b374119033 100644 --- a/trunk/drivers/net/wireless/libertas/assoc.c +++ b/trunk/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);