From patchwork Wed Nov 27 06:45:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 3246681 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6B9CA9F3A0 for ; Wed, 27 Nov 2013 06:53:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8797320574 for ; Wed, 27 Nov 2013 06:53:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9278B2053D for ; Wed, 27 Nov 2013 06:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750986Ab3K0GxB (ORCPT ); Wed, 27 Nov 2013 01:53:01 -0500 Received: from mail-oa0-f41.google.com ([209.85.219.41]:53674 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752104Ab3K0Gwx (ORCPT ); Wed, 27 Nov 2013 01:52:53 -0500 Received: by mail-oa0-f41.google.com with SMTP id j17so7223189oag.14 for ; Tue, 26 Nov 2013 22:52:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=iOEGMLcOmhYUnP3DUK5bBHQNhJNw/0G6h6JL9q9PdBg=; b=qm/+5tRAD/AGr7HZgrIB0ukQmttP36TyvjWLAYmp/8gmwKvffGTO2805e8HWmAVOzA uEfJ7c+irS7mVL6+MN4pgBGIktwkOlUPT+LbraS0fO7DP0mDkl9SlikwpS9feLp1mD2d 2kj4V+3iuTBcQdmlb3vShYRoo4b6LjbcWCQJ9NNvgoB/BnS2UqXY0xP+KwPG8XhCgehy pPzwMEmKsk4mjTlKsKCZjWu6F4JmKld3EdbD2DSWOgQlbG5CS2EHX8cwTjGfCGwjJtIv G+K8X4c++wSizgoeWPzNjF9w6alWXsKYKmtviAzqK2SFCtx94PXFlz7KB+7hmI2295jK ElvQ== X-Received: by 10.182.227.136 with SMTP id sa8mr14240910obc.39.1385535172553; Tue, 26 Nov 2013 22:52:52 -0800 (PST) Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241]) by mx.google.com with ESMTPSA id j9sm5377811oef.8.2013.11.26.22.52.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2013 22:52:51 -0800 (PST) From: Felipe Contreras To: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, "John W. Linville" , Johannes Berg , "David S. Miller" , Felipe Contreras Subject: [RESEND/PATCH v2] mac80211: add assoc beacon timeout logic Date: Wed, 27 Nov 2013 00:45:32 -0600 Message-Id: <1385534732-8129-1-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.8.4.2+fc1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We don't want to be waiting forever for a beacon that will never come, just continue the association. Signed-off-by: Felipe Contreras --- This is exactly the same as the previous patch. All the reasons given to not apply this patch have been dismissed. Power saving is disabled as expected, regulatory/radar doesn't apply to the station mode, we already connect if there are no APs for other drivers. Therefore there's no reason standing to not apply the patch. net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 611abfc..e1f858d 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -358,6 +358,7 @@ struct ieee80211_mgd_assoc_data { const u8 *supp_rates; unsigned long timeout; + unsigned long beacon_timeout; int tries; u16 capability; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 86e4ad5..68f76f7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -38,6 +38,7 @@ #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) #define IEEE80211_ASSOC_TIMEOUT_LONG (HZ / 2) #define IEEE80211_ASSOC_TIMEOUT_SHORT (HZ / 10) +#define IEEE80211_ASSOC_BEACON_TIMEOUT 2 * HZ #define IEEE80211_ASSOC_MAX_TRIES 3 static int max_nullfunc_tries = 2; @@ -3475,6 +3476,24 @@ void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata, ieee80211_queue_work(&local->hw, &sdata->work); } +static int check_beacon(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; + struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data; + + if (!assoc_data->need_beacon || ifmgd->have_beacon) + return true; + + if (time_after(jiffies, assoc_data->beacon_timeout)) { + sdata_info(sdata, "no beacon from %pM\n", assoc_data->bss->bssid); + return true; + } + + assoc_data->timeout = TU_TO_EXP_TIME(assoc_data->bss->beacon_interval); + run_again(sdata, assoc_data->timeout); + return false; +} + void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; @@ -3533,12 +3552,12 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started && time_after(jiffies, ifmgd->assoc_data->timeout)) { - if ((ifmgd->assoc_data->need_beacon && !ifmgd->have_beacon) || - ieee80211_do_assoc(sdata)) { - struct cfg80211_bss *bss = ifmgd->assoc_data->bss; - - ieee80211_destroy_assoc_data(sdata, false); - cfg80211_assoc_timeout(sdata->dev, bss); + if (check_beacon(sdata)) { + if (ieee80211_do_assoc(sdata)) { + struct cfg80211_bss *bss = ifmgd->assoc_data->bss; + ieee80211_destroy_assoc_data(sdata, false); + cfg80211_assoc_timeout(sdata->dev, bss); + } } } else if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started) run_again(sdata, ifmgd->assoc_data->timeout); @@ -4335,6 +4354,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, sdata_info(sdata, "waiting for beacon from %pM\n", ifmgd->bssid); assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval); + assoc_data->beacon_timeout = jiffies + IEEE80211_ASSOC_BEACON_TIMEOUT; assoc_data->timeout_started = true; assoc_data->need_beacon = true; } else if (beacon_ies) {