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>

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 2d5ea21be47e592af98599e214697d6b022718f2..38bd294734a7e3b13c1fa1d9ff486211b3eccb51 100644 (file)
--- 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,
        wmi_set_ie(wil, WMI_FRAME_ASSOC_RESP, bcon->assocresp_ies_len,
                   bcon->assocresp_ies);
 
-       wil->secure_pcp = info->privacy;
+       wil->privacy = info->privacy;
 
        netif_carrier_on(ndev);
 

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index fd59751533869ccd7e44dc61566cd3334f2eb703..fbe27a34e1462367a6b7bfc3a2637d542db32577 100644 (file)
--- 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,
 
 /* fields in struct wil6210_priv */
 static const struct dbg_off dbg_wil_off[] = {
-       WIL_FIELD(secure_pcp,   S_IRUGO | S_IWUSR,      doff_u32),
+       WIL_FIELD(privacy,      S_IRUGO,                doff_u32),
        WIL_FIELD(status[0],    S_IRUGO | S_IWUSR,      doff_ulong),
        WIL_FIELD(fw_version,   S_IRUGO,                doff_u32),
        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 4afb8e4bde852893f0a8cbb733001645bec0f010..b6e65c37d410eccfb93ed51e56b52b3fdc192b8b 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -540,7 +540,7 @@ struct wil6210_priv {
        wait_queue_head_t wq; /* for all wait_event() use */
        /* profile */
        u32 monitor_flags;
-       u32 secure_pcp; /* create secure PCP? */
+       u32 privacy; /* secure connection? */
        int sinfo_gen;
        /* interrupt moderation */
        u32 tx_max_burst_duration;

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index e60186cf4e3cab4dd66b5795151ec5d887ea8063..0213135249137d873627c35c3bd102c954bdfd62 100644 (file)
--- 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)
                struct wmi_pcp_started_event evt;
        } __packed reply;
 
-       if (!wil->secure_pcp)
+       if (!wil->privacy)
                cmd.disable_sec = 1;
 
        if ((cmd.pcp_max_assoc_sta > WIL6210_MAX_CID) ||