mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
wl1271: remove workaround for disconnection
Now we're using a the idle information coming from mac80211 to decide when to disconnect. If we have joined (ie. we're listening to a channel), whenever the interface goes to idle, we will issue a disconnect command. So the workaround to send a disconnect command before joining is not needed anymore. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
c7f43e451b
commit
9cf25fed6a
1 changed files with 0 additions and 15 deletions
|
@ -344,19 +344,6 @@ int wl1271_cmd_join(struct wl1271 *wl)
|
||||||
do_cal = false;
|
do_cal = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME: This is a workaround, because with the current stack, we
|
|
||||||
* cannot know when we have disassociated. So, if we have already
|
|
||||||
* joined, we disconnect before joining again. */
|
|
||||||
if (wl->joined) {
|
|
||||||
ret = wl1271_cmd_disconnect(wl);
|
|
||||||
if (ret < 0) {
|
|
||||||
wl1271_error("failed to disconnect before rejoining");
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
wl->joined = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
join = kzalloc(sizeof(*join), GFP_KERNEL);
|
join = kzalloc(sizeof(*join), GFP_KERNEL);
|
||||||
if (!join) {
|
if (!join) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
|
@ -421,8 +408,6 @@ int wl1271_cmd_join(struct wl1271 *wl)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
wl->joined = true;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
|
* ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
|
||||||
* simplify locking we just sleep instead, for now
|
* simplify locking we just sleep instead, for now
|
||||||
|
|
Loading…
Reference in a new issue