diff options
| author | Eliad Peller | 2011-10-05 11:55:58 +0200 |
|---|---|---|
| committer | Luciano Coelho | 2011-10-07 07:32:48 +0200 |
| commit | 6a8997964366f51c39d8efcfdc0e6319b2bd01fa (patch) | |
| tree | 64e5ba7a2424fba1fd31e7399043cf23d025dec0 /drivers/net/wireless/wl12xx/main.c | |
| parent | wl12xx: move dev_hlid into wlvif (diff) | |
| download | kernel-qcow2-linux-6a8997964366f51c39d8efcfdc0e6319b2bd01fa.tar.gz kernel-qcow2-linux-6a8997964366f51c39d8efcfdc0e6319b2bd01fa.tar.xz kernel-qcow2-linux-6a8997964366f51c39d8efcfdc0e6319b2bd01fa.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index e8d73d70cedf..577266defe9e 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1900,6 +1900,8 @@ static int wl12xx_init_vif_data(struct ieee80211_vif *vif) wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC; wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC; wlvif->rate_set = CONF_TX_RATE_MASK_BASIC; + wlvif->beacon_int = WL1271_DEFAULT_BEACON_INT; + return 0; } @@ -3286,7 +3288,7 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl, wl1271_debug(DEBUG_MASTER, "beacon interval updated: %d", bss_conf->beacon_int); - wl->beacon_int = bss_conf->beacon_int; + wlvif->beacon_int = bss_conf->beacon_int; } if ((changed & BSS_CHANGED_BEACON)) { @@ -4889,7 +4891,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) } wl->channel = WL1271_DEFAULT_CHANNEL; - wl->beacon_int = WL1271_DEFAULT_BEACON_INT; wl->default_key = 0; wl->rx_counter = 0; wl->psm_entry_retry = 0; |