From patchwork Tue Oct 15 21:16:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 3048641 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 428E1BF924 for ; Tue, 15 Oct 2013 21:16:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7917520425 for ; Tue, 15 Oct 2013 21:16:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 708E720278 for ; Tue, 15 Oct 2013 21:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933525Ab3JOVQZ (ORCPT ); Tue, 15 Oct 2013 17:16:25 -0400 Received: from mail-oa0-f54.google.com ([209.85.219.54]:38363 "EHLO mail-oa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933519Ab3JOVQZ (ORCPT ); Tue, 15 Oct 2013 17:16:25 -0400 Received: by mail-oa0-f54.google.com with SMTP id n5so6414725oag.27 for ; Tue, 15 Oct 2013 14:16:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gry0X2XkhV+IfmqdnG6DPO9iqyYrI0FR0HErxEUWGHU=; b=HGo95mY+E7CzNILDqDQxZd7SIlLnuVTdaligdKAQMCwKWN+pyia5UdRM7f9VqNkS14 3dXYl96bKxoY6yUYqAhy6YnQEC5aJgYqLQVGsJ9PLv9b9ERBRrL5HCOVuH+YDEwDvqnX /WVa3JghKmYgmJkHqmrwtBl+LuMzb5rW6r8r1a2FTtt6EItqRjCeoR0AtZPfZeDoJkxr qS/991kHb1CrrksBOCipraJyRuHAmQYOTT7+/aqmrnXcBK41GOOxLMBK7JHKJ2yrugkt Wt0CELaUS2wwG8y+HqFVJFZqfzgjeCSSnC6m9QB9oCVjP70lIjejkBFO6qzI74hADOTd KA0Q== X-Gm-Message-State: ALoCoQmZbqP8jCGVKme/f+mt1f+IbdOM5ecVl0Yl7XBiOVnyu8+pF79VQvzR1KBbpuFGvv/jJa5O X-Received: by 10.182.149.168 with SMTP id ub8mr606134obb.74.1381871783894; Tue, 15 Oct 2013 14:16:23 -0700 (PDT) Received: from localhost (64-126-112-59.dyn.everestkc.net. [64.126.112.59]) by mx.google.com with ESMTPSA id s9sm53823970obu.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:16:23 -0700 (PDT) From: Seth Forshee To: Johannes Berg Cc: linux-wireless@vger.kernel.org Subject: [PATCH] mac80211: Remove check for offchannel state when waking netdev queues Date: Tue, 15 Oct 2013 16:16:21 -0500 Message-Id: <1381871781-29128-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.8.3.2 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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 6c17b77b67587b9f9e3070fb89fe98cef3187131 ensures that a device's mac80211 queues will remain stopped while offchannel. Since the vif can no longer be offchannel when the queues wake it's not necessary to check for this before waking its netdev queues. Signed-off-by: Seth Forshee --- net/mac80211/util.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index e1b34a1..561af30 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -300,9 +300,6 @@ void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue) if (!sdata->dev) continue; - if (test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) - continue; - if (sdata->vif.cab_queue != IEEE80211_INVAL_HW_QUEUE && local->queue_stop_reasons[sdata->vif.cab_queue] != 0) continue;