wl12xx: move beacon_int into wlvif

move beacon_int into the per-interface data, rather than
being global.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 166d984cb5af..68375ffb4123 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -573,7 +573,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 cmd->band = WL12XX_BAND_5GHZ;
         cmd->channel = wl->channel;
         cmd->sta.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
-        cmd->sta.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->sta.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->sta.ssid_type = WL12XX_SSID_TYPE_ANY;
         cmd->sta.ssid_len = wlvif->ssid_len;
         memcpy(cmd->sta.ssid, wlvif->ssid, wlvif->ssid_len);
@@ -684,7 +684,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         cmd->ap.global_hlid = wlvif->ap.global_hlid;
         cmd->ap.broadcast_hlid = wlvif->ap.bcast_hlid;
         cmd->ap.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
-        cmd->ap.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->ap.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->ap.dtim_interval = bss_conf->dtim_period;
         cmd->ap.beacon_expiry = WL1271_AP_DEF_BEACON_EXP;
         cmd->channel = wl->channel;
@@ -787,7 +787,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 cmd->band = WL12XX_BAND_5GHZ;
         cmd->channel = wl->channel;
         cmd->ibss.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
-        cmd->ibss.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->ibss.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->ibss.dtim_interval = bss_conf->dtim_period;
         cmd->ibss.ssid_type = WL12XX_SSID_TYPE_ANY;
         cmd->ibss.ssid_len = wlvif->ssid_len;