From patchwork Thu Aug 8 08:14:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 2840836 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 3E64C9F487 for ; Thu, 8 Aug 2013 08:14:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E0762035C for ; Thu, 8 Aug 2013 08:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EEFA2034E for ; Thu, 8 Aug 2013 08:14:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933999Ab3HHIOT (ORCPT ); Thu, 8 Aug 2013 04:14:19 -0400 Received: from ebb06.tieto.com ([131.207.168.38]:47996 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933986Ab3HHIOR (ORCPT ); Thu, 8 Aug 2013 04:14:17 -0400 X-AuditID: 83cfa826-b7f408e000003a47-7f-52035356287a Received: from FIHGA-EXHUB01.eu.tieto.com ( [131.207.136.34]) by ebb06.tieto.com (SMTP Mailer) with SMTP id 8F.03.14919.65353025; Thu, 8 Aug 2013 11:14:15 +0300 (EEST) Received: from uw001058.eu.tieto.com (10.28.19.57) by inbound.tieto.com (131.207.136.49) with Microsoft SMTP Server id 8.3.298.1; Thu, 8 Aug 2013 11:14:14 +0300 From: Michal Kazior To: CC: , Michal Kazior Subject: [PATCH 1/4] ath10k: clean up monitor start code Date: Thu, 8 Aug 2013 10:14:07 +0200 Message-ID: <1375949650-9699-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375949650-9699-1-git-send-email-michal.kazior@tieto.com> References: <1375949650-9699-1-git-send-email-michal.kazior@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsXSfL5DSTc8mDnIYP9VVotHl44xW7xZcYfd 4tvWB2wOzB6fZ95l89i8pN7j8ya5AOYoLpuU1JzMstQifbsErowtl+4wF6znqFh8bQJbA2Mf excjJ4eEgInEsn8PmCBsMYkL99azdTFycQgJrGKUuDp9E1hCSGAJo8StNb4gNpuArsSrxrOs ILaIgILEr0kf2UBsZgFfiWdPloHVCwtYSJxftwosziKgItFwYTkziM0r4CbRc3cqUC8H0DIF iTmTbEDCnALuEit3LIZa5SZxoXctI0S5oMTJmU9YIMZLSBx88YIZokZF4uD6/cwTGAVmISmb haRsASPTKkb+1KQkAzO9kszUkny95PzcTYzgAFyhtoPx2QOpQ4wCHIxKPLwdAUxBQqyJZcWV uYcYJTmYlER5k92Yg4T4kvJTKjMSizPii0pzUosPMUpwMCuJ8F4sBirnTUmsrEotyodJSXOw KInzPlICSgmkJ5akZqemFqQWwWRlODiUJHi3BgINFSxKTU+tSMvMKUFIM3FwggznARp+HKSG t7ggMbc4Mx0if4pRUUqc9xhIQgAkkVGaB9cLSxCvGMWBXhHm5QoCquIBJhe47ldAg5mABnuc ZAAZXJKIkJJqYOyy1ZJt+lDzsOmOgENrRUhdfIjZlTbVqjd93zf/tb924snOZSIvd0qETIpa 9v6FKk+7uUWZcHcm/+v3E5XW7fr+4PqvzOMvuQxnrBFZ3/Dl2fr8cNfmOfc50zLCtjR0KNpc 3SSuzPRVZ4X+A5/mHKnp9fE74sSXZXo8NloudaVcOitc9bsdlxJLcUaioRZzUXEiAPWvuz/r AgAA 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.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 Remove useless code that was causing WARN_ON when a 80MHz+ vif entered promiscuous mode or monitor interface was started. The channel mode is already computed by chan_to_phymode(). Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index cf2ba4d..05f5f76 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -503,13 +503,10 @@ static int ath10k_monitor_start(struct ath10k *ar, int vdev_id) { struct ieee80211_channel *channel = ar->hw->conf.chandef.chan; struct wmi_vdev_start_request_arg arg = {}; - enum nl80211_channel_type type; int ret = 0; lockdep_assert_held(&ar->conf_mutex); - type = cfg80211_get_chandef_type(&ar->hw->conf.chandef); - arg.vdev_id = vdev_id; arg.channel.freq = channel->center_freq; arg.channel.band_center_freq1 = ar->hw->conf.chandef.center_freq1;