From patchwork Mon Mar 31 12:04:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3913851 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 ED3C59F357 for ; Mon, 31 Mar 2014 12:10:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B04F20220 for ; Mon, 31 Mar 2014 12:10:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39A0E2021B for ; Mon, 31 Mar 2014 12:10:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752382AbaCaMKm (ORCPT ); Mon, 31 Mar 2014 08:10:42 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:60456 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbaCaMKf (ORCPT ); Mon, 31 Mar 2014 08:10:35 -0400 Received: by mail-wg0-f52.google.com with SMTP id k14so5693988wgh.23 for ; Mon, 31 Mar 2014 05:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zwKi6OHzAgKmsFLkpQcDhpJFZMspT1s0aEOSs4PkMPM=; b=ROP8hwxea/bZ9CMh53KgdthxsFKMuiVgktD9JWlPqg6KRFKdWZtcQMREKdQRrAUmOH /9JTK+GMXtJUeLJoynR3XSM4lHHPmEbXMt1kLMBOiI0jhBeiNk/HKG8FpJmBp3wiurXz SPxK0bqdiSvYejSTtnefdla6Sy7no1RjObU+E= 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:in-reply-to :references; bh=zwKi6OHzAgKmsFLkpQcDhpJFZMspT1s0aEOSs4PkMPM=; b=V0z2cHT4uy+Zokzlxm9alR7xNUZD96UGwkSbnJ0+CLrxRew7qJBVzVcvEsqUQOC1V5 tXVnhedOzBB/nY1+qWSD4cyA80+Eg0YfV7zkIpCkphSFE1CAH3su+iosHYOTgxlf9ptG 7MfxAJ6ec1YwSmUL5djkXjiY7893mvJJrmkcZov2XlE+CCjSVyZsFQdAKobqRIkA0nv3 lvexhKkhMLTQ4yH9GfublpR6wNW+ASwlcUeQ4wv2ZdqqmJjuFlNDt7+LyLsfrwRI3f2q 0IiRFr7zDkgrP/kCVh5PE8pAMiCxJ0lSVF+hESOCkT2QzW+PxebW9c7sQLkWLLndrJdu 97jQ== X-Gm-Message-State: ALoCoQmQiJ18OUC70MWYV3Odi2SFVHJLy6yG+WPpEw3PjF6x87lom4IPVwOPsx+7/jqSeVSit5wwTCOd+jBtM9UyDvb8QMhOaR4CKA+50QPJ4Xc7IfjIYUo= X-Received: by 10.194.57.239 with SMTP id l15mr12669988wjq.40.1396267828979; Mon, 31 Mar 2014 05:10:28 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id x45sm32645669eef.15.2014.03.31.05.10.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2014 05:10:28 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v3 5/5] cfg80211: remove channel_switch combination check Date: Mon, 31 Mar 2014 14:04:19 +0200 Message-Id: <1396267459-9976-6-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1396267459-9976-1-git-send-email-michal.kazior@tieto.com> References: <1395409941-26303-1-git-send-email-michal.kazior@tieto.com> <1396267459-9976-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.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.4 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 Make the driver responsible for making sure it is capable of performing the switch. It might as well accept a request but then disconnect an interface if some requirements are not met. In that case userspace should be prepared for an appropriate event (AP/IBSS/mesh being stopped/left). Signed-off-by: Michal Kazior --- net/wireless/nl80211.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 232d15c..84aeb80 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5932,17 +5932,6 @@ skip_beacons: params.radar_required = true; } - /* TODO: I left this here for now. With channel switch, the - * verification is a bit more complicated, because we only do - * it later when the channel switch really happens. - */ - err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype, - params.chandef.chan, - CHAN_MODE_SHARED, - radar_detect_width); - if (err) - return err; - if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) params.block_tx = true;