diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-09 15:10:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-09 15:10:14 -0700 |
| commit | b41f5bfff73f244101b34f3603974ef7aeadf545 (patch) | |
| tree | 5c7fc7de15a020cde0f99fac3e61d981a1d59022 /drivers/net/wireless/libertas/assoc.c | |
| parent | bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 (diff) | |
| parent | e91e9d490d9ae382003ef9d05fd50238db54c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
| -rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index 87e145ffe8f..6a24ed6067e 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c @@ -541,7 +541,7 @@ void lbs_association_worker(struct work_struct *work) } if (find_any_ssid) { - u8 new_mode; + u8 new_mode = assoc_req->mode; ret = lbs_find_best_network_ssid(priv, assoc_req->ssid, &assoc_req->ssid_len, assoc_req->mode, &new_mode); |