aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>2015-02-15 07:02:36 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-02-27 03:15:22 -0500
commit774974e50432c8d7210c337152afb4d646344d8a (patch)
tree43eb2500061192f73531366e4dc16c7c9ada3fa1
parent8f55cbec7f8856438eef80e23f26331bea124128 (diff)
wil6210: rename 'secure_pcp' to 'privacy'
Make this field to track privacy attribute for all interface types Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/ath/wil6210/cfg80211.c2
-rw-r--r--drivers/net/wireless/ath/wil6210/debugfs.c2
-rw-r--r--drivers/net/wireless/ath/wil6210/wil6210.h2
-rw-r--r--drivers/net/wireless/ath/wil6210/wmi.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 2d5ea21be47e..38bd294734a7 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -769,7 +769,7 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
769 wmi_set_ie(wil, WMI_FRAME_ASSOC_RESP, bcon->assocresp_ies_len, 769 wmi_set_ie(wil, WMI_FRAME_ASSOC_RESP, bcon->assocresp_ies_len,
770 bcon->assocresp_ies); 770 bcon->assocresp_ies);
771 771
772 wil->secure_pcp = info->privacy; 772 wil->privacy = info->privacy;
773 773
774 netif_carrier_on(ndev); 774 netif_carrier_on(ndev);
775 775
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index fd5975153386..fbe27a34e146 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1400,7 +1400,7 @@ static void wil6210_debugfs_init_isr(struct wil6210_priv *wil,
1400 1400
1401/* fields in struct wil6210_priv */ 1401/* fields in struct wil6210_priv */
1402static const struct dbg_off dbg_wil_off[] = { 1402static const struct dbg_off dbg_wil_off[] = {
1403 WIL_FIELD(secure_pcp, S_IRUGO | S_IWUSR, doff_u32), 1403 WIL_FIELD(privacy, S_IRUGO, doff_u32),
1404 WIL_FIELD(status[0], S_IRUGO | S_IWUSR, doff_ulong), 1404 WIL_FIELD(status[0], S_IRUGO | S_IWUSR, doff_ulong),
1405 WIL_FIELD(fw_version, S_IRUGO, doff_u32), 1405 WIL_FIELD(fw_version, S_IRUGO, doff_u32),
1406 WIL_FIELD(hw_version, S_IRUGO, doff_x32), 1406 WIL_FIELD(hw_version, S_IRUGO, doff_x32),
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 4afb8e4bde85..b6e65c37d410 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -540,7 +540,7 @@ struct wil6210_priv {
540 wait_queue_head_t wq; /* for all wait_event() use */ 540 wait_queue_head_t wq; /* for all wait_event() use */
541 /* profile */ 541 /* profile */
542 u32 monitor_flags; 542 u32 monitor_flags;
543 u32 secure_pcp; /* create secure PCP? */ 543 u32 privacy; /* secure connection? */
544 int sinfo_gen; 544 int sinfo_gen;
545 /* interrupt moderation */ 545 /* interrupt moderation */
546 u32 tx_max_burst_duration; 546 u32 tx_max_burst_duration;
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index e60186cf4e3c..021313524913 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -874,7 +874,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
874 struct wmi_pcp_started_event evt; 874 struct wmi_pcp_started_event evt;
875 } __packed reply; 875 } __packed reply;
876 876
877 if (!wil->secure_pcp) 877 if (!wil->privacy)
878 cmd.disable_sec = 1; 878 cmd.disable_sec = 1;
879 879
880 if ((cmd.pcp_max_assoc_sta > WIL6210_MAX_CID) || 880 if ((cmd.pcp_max_assoc_sta > WIL6210_MAX_CID) ||