From 975409c7928b080531048b914fe25ef2fbdf12d4 Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Mon, 24 May 2010 11:18:15 +0300 Subject: [PATCH] --- yaml --- r: 202783 b: refs/heads/master c: db81956cc4a6780e9aeb1e85993096e67dcb0cd3 h: refs/heads/master i: 202781: a5141a28da1a5a5ad220184d920c4329324e5f72 202779: 2e97d90f097a28ae8212cefef5c0c520949faba6 202775: ad0691765a922ec147d1f96335dd49e682cf68a3 202767: bc8f9987eacfea34169a2d741573ac21aad2292f 202751: 09c99c4de5de2d56b5401c971b172d8f1a869e79 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c | 6 ------ trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 5 +++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2cb6244f474f..1d3da1a78fa3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43163f0f8a11822607c36249c6f55f0613e0d73d +refs/heads/master: db81956cc4a6780e9aeb1e85993096e67dcb0cd3 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c index d7bcce887c41..05b6d8a4aea2 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c @@ -336,12 +336,6 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) join->channel = wl->channel; join->ssid_len = wl->ssid_len; memcpy(join->ssid, wl->ssid, wl->ssid_len); - join->ctrl = WL1271_JOIN_CMD_CTRL_TX_FLUSH; - - /* increment the session counter */ - wl->session_counter++; - if (wl->session_counter >= SESSION_COUNTER_MAX) - wl->session_counter = 0; join->ctrl |= wl->session_counter << WL1271_JOIN_CMD_TX_SESSION_OFFSET; diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index 032cb5de908c..108a3e2a58fd 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1135,6 +1135,11 @@ static int wl1271_dummy_join(struct wl1271 *wl) memcpy(wl->bssid, dummy_bssid, ETH_ALEN); + /* increment the session counter */ + wl->session_counter++; + if (wl->session_counter >= SESSION_COUNTER_MAX) + wl->session_counter = 0; + /* pass through frames from all BSS */ wl1271_configure_filters(wl, FIF_OTHER_BSS);