From patchwork Tue Apr 5 10:53:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 8749491 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA4A4C0553 for ; Tue, 5 Apr 2016 10:53:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C30542022A for ; Tue, 5 Apr 2016 10:53:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2C6820204 for ; Tue, 5 Apr 2016 10:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757379AbcDEKxM (ORCPT ); Tue, 5 Apr 2016 06:53:12 -0400 Received: from mga11.intel.com ([192.55.52.93]:2229 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754403AbcDEKxL (ORCPT ); Tue, 5 Apr 2016 06:53:11 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 05 Apr 2016 03:53:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,443,1455004800"; d="scan'208";a="79315868" Received: from tekscope-c1e60e.jer.intel.com (HELO egrumbacBOX.ger.corp.intel.com) ([10.12.217.228]) by fmsmga004.fm.intel.com with ESMTP; 05 Apr 2016 03:53:08 -0700 From: Emmanuel Grumbach To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Avraham Stern , Emmanuel Grumbach Subject: [PATCH v2] mac80211: add an option to not disconnect on beacon loss Date: Tue, 5 Apr 2016 13:53:06 +0300 Message-Id: <1459853587-31180-1-git-send-email-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 2.5.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Avraham Stern Add the option to set mac80211 to not disconnect on beacon loss. If this option is set, mac80211 will send a beacon loss event to userspace but will not disconnect. The beacon loss event is sent only once as long as no response is received from the AP. If after receiving response from the AP the beacon loss threshold is hit again, another beacon loss event will be sent. The default behavior remains as it was: probe the AP and disconnect if the AP does not respond. Signed-off-by: Avraham Stern Signed-off-by: Emmanuel Grumbach --- v2: fix the race --- net/mac80211/ieee80211_i.h | 2 ++ net/mac80211/main.c | 2 ++ net/mac80211/mlme.c | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ff8d08b..ea4fef3 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -356,6 +356,8 @@ enum ieee80211_sta_flags { IEEE80211_STA_DISABLE_160MHZ = BIT(13), IEEE80211_STA_DISABLE_WMM = BIT(14), IEEE80211_STA_ENABLE_RRM = BIT(15), + IEEE80211_STA_BEACON_LOSS_DO_NOT_DISCONNECT = BIT(16), + IEEE80211_STA_BEACON_LOSS_REPORTED = BIT(17), }; struct ieee80211_mgd_auth_data { diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 33c80de..6083256 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -554,6 +554,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN | NL80211_FEATURE_AP_SCAN; + wiphy_ext_feature_set(wiphy, + NL80211_EXT_FEATURE_BEACON_LOSS_DO_NOT_DISCONNECT); if (!ops->set_key) wiphy->flags |= WIPHY_FLAG_IBSS_RSN; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index d3c75ac..1c9823e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -128,6 +128,8 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) if (ifmgd->probe_send_count) ifmgd->probe_send_count = 0; + sdata->u.mgd.flags &= ~IEEE80211_STA_BEACON_LOSS_REPORTED; + if (ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR)) return; @@ -1927,6 +1929,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, /* just to be sure */ ieee80211_stop_poll(sdata); + sdata->u.mgd.flags &= ~IEEE80211_STA_BEACON_LOSS_REPORTED; ieee80211_led_assoc(local, 1); @@ -1985,6 +1988,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, return; ieee80211_stop_poll(sdata); + ifmgd->flags &= ~IEEE80211_STA_BEACON_LOSS_REPORTED; ifmgd->associated = NULL; netif_carrier_off(sdata->dev); @@ -2432,8 +2436,12 @@ static void ieee80211_beacon_connection_loss_work(struct work_struct *work) sdata_info(sdata, "Connection to AP %pM lost\n", ifmgd->bssid); __ieee80211_disconnect(sdata); - } else { + } else if (!(ifmgd->flags & IEEE80211_STA_BEACON_LOSS_DO_NOT_DISCONNECT)) { ieee80211_mgd_probe_ap(sdata, true); + } else if (!(ifmgd->flags & IEEE80211_STA_BEACON_LOSS_REPORTED)) { + ieee80211_cqm_beacon_loss_notify(&sdata->vif, + GFP_KERNEL); + ifmgd->flags |= IEEE80211_STA_BEACON_LOSS_REPORTED; } } @@ -4752,6 +4760,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, sdata->encrypt_headroom = ieee80211_cs_headroom(local, &req->crypto, sdata->vif.type); + if (req->flags & ASSOC_REQ_BEACON_LOSS_DO_NOT_DISCONNECT) + ifmgd->flags |= IEEE80211_STA_BEACON_LOSS_DO_NOT_DISCONNECT; + else + ifmgd->flags &= ~IEEE80211_STA_BEACON_LOSS_DO_NOT_DISCONNECT; + /* kick off associate process */ ifmgd->assoc_data = assoc_data;