Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 278708
b: refs/heads/master
c: 679a673
h: refs/heads/master
v: v3
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Nov 8, 2011
1 parent 8e4cbc9 commit ec108fa
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f1680147ce2509383e053fa843020e0e9f3c6ce
refs/heads/master: 679a673414473239d189b5b41ea4014b088be7b9
53 changes: 51 additions & 2 deletions trunk/drivers/net/wireless/wl12xx/cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@ static int wl12xx_get_new_session_id(struct wl1271 *wl,
return wlvif->session_counter;
}

int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
struct wl12xx_vif *wlvif)
{
struct wl12xx_cmd_role_start *cmd;
int ret;
Expand Down Expand Up @@ -516,7 +517,8 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
return ret;
}

int wl12xx_cmd_role_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
static int wl12xx_cmd_role_stop_dev(struct wl1271 *wl,
struct wl12xx_vif *wlvif)
{
struct wl12xx_cmd_role_stop *cmd;
int ret;
Expand Down Expand Up @@ -1776,3 +1778,50 @@ int wl12xx_cmd_stop_channel_switch(struct wl1271 *wl)
out:
return ret;
}

/* start dev role and roc on its channel */
int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
{
int ret;

if (WARN_ON(!(wlvif->bss_type == BSS_TYPE_STA_BSS ||
wlvif->bss_type == BSS_TYPE_IBSS)))
return -EINVAL;

ret = wl12xx_cmd_role_start_dev(wl, wlvif);
if (ret < 0)
goto out;

ret = wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
if (ret < 0)
goto out_stop;

return 0;

out_stop:
wl12xx_cmd_role_stop_dev(wl, wlvif);
out:
return ret;
}

/* croc dev hlid, and stop the role */
int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
{
int ret;

if (WARN_ON(!(wlvif->bss_type == BSS_TYPE_STA_BSS ||
wlvif->bss_type == BSS_TYPE_IBSS)))
return -EINVAL;

if (test_bit(wlvif->dev_role_id, wl->roc_map)) {
ret = wl12xx_croc(wl, wlvif->dev_role_id);
if (ret < 0)
goto out;
}

ret = wl12xx_cmd_role_stop_dev(wl, wlvif);
if (ret < 0)
goto out;
out:
return ret;
}
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/wl12xx/cmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);
int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,
u8 *role_id);
int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id);
int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);
int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);
int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);
Expand Down
40 changes: 10 additions & 30 deletions trunk/drivers/net/wireless/wl12xx/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2429,11 +2429,7 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (idle) {
/* no need to croc if we weren't busy (e.g. during boot) */
if (wl12xx_is_roc(wl)) {
ret = wl12xx_croc(wl, wlvif->dev_role_id);
if (ret < 0)
goto out;

ret = wl12xx_cmd_role_stop_dev(wl, wlvif);
ret = wl12xx_stop_dev(wl, wlvif);
if (ret < 0)
goto out;
}
Expand All @@ -2455,11 +2451,7 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,
ieee80211_sched_scan_stopped(wl->hw);
}

ret = wl12xx_cmd_role_start_dev(wl, wlvif);
if (ret < 0)
goto out;

ret = wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
ret = wl12xx_start_dev(wl, wlvif);
if (ret < 0)
goto out;
clear_bit(WL1271_FLAG_IDLE, &wl->flags);
Expand Down Expand Up @@ -2525,16 +2517,13 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
*/
if (wl12xx_is_roc(wl) &&
!(conf->flags & IEEE80211_CONF_IDLE)) {
ret = wl12xx_croc(wl,
wlvif->dev_role_id);
ret = wl12xx_stop_dev(wl, wlvif);
if (ret < 0)
return ret;

ret = wl12xx_roc(wl, wlvif,
wlvif->dev_role_id);
ret = wl12xx_start_dev(wl, wlvif);
if (ret < 0)
wl1271_warning("roc failed %d",
ret);
return ret;
}
}
}
Expand Down Expand Up @@ -3087,8 +3076,7 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
ret = -EBUSY;
goto out_sleep;
}
wl12xx_croc(wl, wlvif->dev_role_id);
wl12xx_cmd_role_stop_dev(wl, wlvif);
wl12xx_stop_dev(wl, wlvif);
}

ret = wl1271_scan(hw->priv, vif, ssid, len, req);
Expand Down Expand Up @@ -3599,8 +3587,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED,
&wlvif->flags)) {
wl1271_unjoin(wl, wlvif);
wl12xx_cmd_role_start_dev(wl, wlvif);
wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
wl12xx_start_dev(wl, wlvif);
}
}
}
Expand Down Expand Up @@ -3776,11 +3763,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
}

wl1271_unjoin(wl, wlvif);
if (!(conf_flags & IEEE80211_CONF_IDLE)) {
wl12xx_cmd_role_start_dev(wl, wlvif);
wl12xx_roc(wl, wlvif,
wlvif->dev_role_id);
}
if (!(conf_flags & IEEE80211_CONF_IDLE))
wl12xx_start_dev(wl, wlvif);
}
}
}
Expand Down Expand Up @@ -3859,11 +3843,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
* STA role). TODO: make it better.
*/
if (wlvif->dev_role_id != WL12XX_INVALID_ROLE_ID) {
ret = wl12xx_croc(wl, wlvif->dev_role_id);
if (ret < 0)
goto out;

ret = wl12xx_cmd_role_stop_dev(wl, wlvif);
ret = wl12xx_stop_dev(wl, wlvif);
if (ret < 0)
goto out;
}
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/wl12xx/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
(is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
!test_bit(wlvif->dev_role_id, wl->roc_map)) {
/* restore remain on channel */
wl12xx_cmd_role_start_dev(wl, wlvif);
wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
wl12xx_start_dev(wl, wlvif);
}
wl1271_ps_elp_sleep(wl);

Expand Down
6 changes: 1 addition & 5 deletions trunk/drivers/net/wireless/wl12xx/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,7 @@ static int wl1271_tx_update_filters(struct wl1271 *wl,
goto out;

wl1271_debug(DEBUG_CMD, "starting device role for roaming");
ret = wl12xx_cmd_role_start_dev(wl, wlvif);
if (ret < 0)
goto out;

ret = wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
ret = wl12xx_start_dev(wl, wlvif);
if (ret < 0)
goto out;
out:
Expand Down

0 comments on commit ec108fa

Please sign in to comment.