aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/join.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/join.c')
-rw-r--r--drivers/net/wireless/libertas/join.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 149531c77938..5a466eced979 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -15,6 +15,8 @@
15#include "join.h" 15#include "join.h"
16#include "dev.h" 16#include "dev.h"
17 17
18#define AD_HOC_CAP_PRIVACY_ON 1
19
18/** 20/**
19 * @brief This function finds out the common rates between rate1 and rate2. 21 * @brief This function finds out the common rates between rate1 and rate2.
20 * 22 *
@@ -683,15 +685,12 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
683 adhs->probedelay = cpu_to_le16(cmd_scan_probe_delay_time); 685 adhs->probedelay = cpu_to_le16(cmd_scan_probe_delay_time);
684 686
685 /* set up privacy in adapter->scantable[i] */ 687 /* set up privacy in adapter->scantable[i] */
686 if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) { 688 if (adapter->secinfo.wep_enabled) {
687 689 lbs_pr_debug(1, "ADHOC_S_CMD: WEP enabled, setting privacy on\n");
688#define AD_HOC_CAP_PRIVACY_ON 1
689 lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus set, privacy to WEP\n");
690 pbssdesc->privacy = wlan802_11privfilter8021xWEP; 690 pbssdesc->privacy = wlan802_11privfilter8021xWEP;
691 adhs->cap.privacy = AD_HOC_CAP_PRIVACY_ON; 691 adhs->cap.privacy = AD_HOC_CAP_PRIVACY_ON;
692 } else { 692 } else {
693 lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus NOT set, Setting " 693 lbs_pr_debug(1, "ADHOC_S_CMD: WEP disabled, setting privacy off\n");
694 "privacy to ACCEPT ALL\n");
695 pbssdesc->privacy = wlan802_11privfilteracceptall; 694 pbssdesc->privacy = wlan802_11privfilteracceptall;
696 } 695 }
697 696
@@ -849,7 +848,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
849 padhocjoin->bssdescriptor.ssparamset.ibssparamset.atimwindow = 848 padhocjoin->bssdescriptor.ssparamset.ibssparamset.atimwindow =
850 cpu_to_le16(pbssdesc->atimwindow); 849 cpu_to_le16(pbssdesc->atimwindow);
851 850
852 if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) { 851 if (adapter->secinfo.wep_enabled) {
853 padhocjoin->bssdescriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON; 852 padhocjoin->bssdescriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON;
854 } 853 }
855 854