From patchwork Mon Nov 18 17:02:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3197141 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 02C4E9F815 for ; Mon, 18 Nov 2013 17:03:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD42B204A2 for ; Mon, 18 Nov 2013 17:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D34A204D9 for ; Mon, 18 Nov 2013 17:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751510Ab3KRRC5 (ORCPT ); Mon, 18 Nov 2013 12:02:57 -0500 Received: from mail-bk0-f47.google.com ([209.85.214.47]:56850 "EHLO mail-bk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751236Ab3KRRCz (ORCPT ); Mon, 18 Nov 2013 12:02:55 -0500 Received: by mail-bk0-f47.google.com with SMTP id mx12so1004490bkb.34 for ; Mon, 18 Nov 2013 09:02:53 -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:in-reply-to:references; bh=Os7NIQTxUIwULqJBCy9rgsvFQT2Jl6j/uAxG2j9oNCA=; b=QUDv6/TQYnofGdcaNeGIgCOqZmNBZtBXC96rx3TTmEJtLvZnWxJzA73ERFMKgvmse4 zLNMMVBPVZ5gVuCFhkoWGKoqq8Pqpddg5/Sf0+W9g45fxJGiICP9Qr8n5SvL/LrxWYMK 1XvkKNMjJF5q5gzLPRWDGg9VelmVVyXvdqwr9gurYdpdJzqF1vRKxnIHxsK3Z1yIo8Fh Fj53BUuaeEMI8x6xmD5n15R60pyZWmopciQ1cIRqr72w+rFbfEtT+igwmfRBOK5IHrLQ UUi4V97Vn92zisO8a9EKm/J/LCEqS2NsFAKFN020ccVI6zY2xnP+N8s00mEmus29FYZm Xumw== X-Received: by 10.204.127.135 with SMTP id g7mr61763bks.42.1384794173857; Mon, 18 Nov 2013 09:02:53 -0800 (PST) Received: from localhost.localdomain (93-173-143-36.bb.netvision.net.il. [93.173.143.36]) by mx.google.com with ESMTPSA id qg7sm17325702bkb.6.2013.11.18.09.02.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 09:02:53 -0800 (PST) From: Emmanuel Grumbach To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Eliad Peller Subject: [PATCH 2/6] mac80211: fix connection polling Date: Mon, 18 Nov 2013 19:02:42 +0200 Message-Id: <1384794166-10906-2-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384794166-10906-1-git-send-email-egrumbach@gmail.com> References: <1384794166-10906-1-git-send-email-egrumbach@gmail.com> 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.3 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 From: Eliad Peller Commit 392b9ff ("mac80211: change beacon/connection polling") removed the IEEE80211_STA_BEACON_POLL flag. However, it accidentally removed the setting of IEEE80211_STA_CONNECTION_POLL, making the connection polling completely useless (the flag is always clear, so the result is never being checked). Fix it. Signed-off-by: Eliad Peller Reviewed-by: Johannes Berg --- net/mac80211/mlme.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index d7504ab..b3a3ce3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1910,6 +1910,8 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, if (ifmgd->flags & IEEE80211_STA_CONNECTION_POLL) already = true; + ifmgd->flags |= IEEE80211_STA_CONNECTION_POLL; + mutex_unlock(&sdata->local->mtx); if (already)