From patchwork Sun Mar 6 17:15:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 8513661 X-Patchwork-Delegate: kvalo@adurom.com 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 E11EFC0553 for ; Sun, 6 Mar 2016 17:23:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F271A2017D for ; Sun, 6 Mar 2016 17:23:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF2A5201C0 for ; Sun, 6 Mar 2016 17:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751319AbcCFRPn (ORCPT ); Sun, 6 Mar 2016 12:15:43 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36827 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138AbcCFRPm (ORCPT ); Sun, 6 Mar 2016 12:15:42 -0500 Received: by mail-wm0-f67.google.com with SMTP id l68so6967167wml.3 for ; Sun, 06 Mar 2016 09:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wizery-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=efHM+OVerQIR4Ucnl3KCtdqWCwG2AdkWRpjqZ4h9ZUA=; b=n+VOZSVIV8PJIIny2WfmMf490HekHagyDBUzvF1B2NX8U1P45E9PpZ8bFawvwgw3j2 eTsZKZtYFPs9o4t+5O3O9Zi/jejmqYdEpwVgYmmxjlrnZd5CA37rCF8NS1/FCJyKe14W qUgJHfEueBGj4FlYi+z/Qo6G/U2ozib2iq5nYpTrwma5pxdFtN7oD9oKT9vE6WXKtwF6 J9x/xWuND29TOusYlWb5i5PlLYZqsnTzEHPo99+nCpzG5BD/mLxFu/jEoI5l+J1ZDBYl 648YpubamIUGukIAniwHSIJQG/J7fPU3vBKte7POY3z/NMo2HqgmK7PF8MUsVTCAmI5u CkSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=efHM+OVerQIR4Ucnl3KCtdqWCwG2AdkWRpjqZ4h9ZUA=; b=ldWP0dv8oAojWDUniv4q2K5dSKpjw5Wo4KobqSizgEENPtZeQvGAB1+SKP5i9U5Isr pWDaey+Bp9/NRA/K4SX8k3noHIj4Z6eSWY7zbpIgEZq+FUc4EgtM5TEQRZjwsWuRgDr+ 6XNsUJccEfMTLdRdQcoAvt4JetJD58N0RWYaxWRZmNU/zFi/coSNulb/h5z0Euj3qvlB iznpgWPEHTDB+ET+HiXJowytDspC5rUybCVEeBaNvrm6pxTksfuMrdZIMV27qqcRa5Te SBjTbH4/mnmV4ZIzOYmzgMHoWr+RyRtLsBr+n8kTQwBk+bsgCKRrDPhYkcJAyJC5sm3z A0BQ== X-Gm-Message-State: AD7BkJInz8sezTFqQ8q1aKBy/4RELTUHDqmmnpLfUr/JHZenqM61b1+5mYYd+VxsdlZ7MQ== X-Received: by 10.28.141.141 with SMTP id p135mr8830388wmd.30.1457284540725; Sun, 06 Mar 2016 09:15:40 -0800 (PST) Received: from localhost.localdomain (93-172-245-144.bb.netvision.net.il. [93.172.245.144]) by smtp.gmail.com with ESMTPSA id 202sm9575459wmo.7.2016.03.06.09.15.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 09:15:40 -0800 (PST) From: Eliad Peller To: linux-wireless@vger.kernel.org Subject: [PATCH 1/2] wlcore: don't WARN_ON in case of existing ROC Date: Sun, 6 Mar 2016 19:15:33 +0200 Message-Id: <1457284534-10789-1-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 2.6.3 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_SIGNED, 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 When working with AP + P2P, it's possible to get into a state when the AP is in ROC (due to assiciating station) while trying to ROC on the P2P interface. Replace the WARN_ON with wl1271_error to avoid warnings in this case. Signed-off-by: Eliad Peller --- drivers/net/wireless/ti/wlcore/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index d1109c4..cb2e8b6 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -5506,9 +5506,10 @@ static int wlcore_op_remain_on_channel(struct ieee80211_hw *hw, goto out; /* return EBUSY if we can't ROC right now */ - if (WARN_ON(wl->roc_vif || - find_first_bit(wl->roc_map, - WL12XX_MAX_ROLES) < WL12XX_MAX_ROLES)) { + if (wl->roc_vif || + find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) < WL12XX_MAX_ROLES) { + wl1271_warning("active roc on role %d", + find_first_bit(wl->roc_map, WL12XX_MAX_ROLES)); ret = -EBUSY; goto out; }