From patchwork Wed Mar 30 17:18:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 674901 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2UHImSh006735 for ; Wed, 30 Mar 2011 17:18:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932826Ab1C3RSr (ORCPT ); Wed, 30 Mar 2011 13:18:47 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:62338 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932107Ab1C3RSq (ORCPT ); Wed, 30 Mar 2011 13:18:46 -0400 Received: by fxm17 with SMTP id 17so1221291fxm.19 for ; Wed, 30 Mar 2011 10:18:45 -0700 (PDT) Received: by 10.223.97.196 with SMTP id m4mr360247fan.105.1301505525474; Wed, 30 Mar 2011 10:18:45 -0700 (PDT) Received: from localhost.localdomain (89-139-63-190.bb.netvision.net.il [89.139.63.190]) by mx.google.com with ESMTPS id 14sm122663fae.23.2011.03.30.10.18.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 30 Mar 2011 10:18:44 -0700 (PDT) From: Ohad Ben-Cohen To: Cc: Luciano Coelho , Ohad Ben-Cohen Subject: [PATCH] wl12xx: fix "JOIN while associated" commentary Date: Wed, 30 Mar 2011 19:18:31 +0200 Message-Id: <1301505511-26582-1-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 30 Mar 2011 17:18:49 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 85cb4da..92def80 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1569,10 +1569,10 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc) * One of the side effects of the JOIN command is that is clears * WPA/WPA2 keys from the chipset. Performing a JOIN while associated * to a WPA/WPA2 access point will therefore kill the data-path. - * Currently there is no supported scenario for JOIN during - * association - if it becomes a supported scenario, the WPA/WPA2 keys - * must be handled somehow. - * + * Currently the only valid scenario for JOIN during association + * is on roaming, in which case we will also be given new keys. + * Keep the below message for now, unless it starts bothering + * users who really like to roam a lot :) */ if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) wl1271_info("JOIN while associated.");