From patchwork Fri Oct 30 13:44:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Dutt Undekari X-Patchwork-Id: 7526951 X-Patchwork-Delegate: johannes@sipsolutions.net 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 05CC5BEEA4 for ; Fri, 30 Oct 2015 13:45:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35E1F20629 for ; Fri, 30 Oct 2015 13:45:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DA1A20602 for ; Fri, 30 Oct 2015 13:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030810AbbJ3NpU (ORCPT ); Fri, 30 Oct 2015 09:45:20 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:22426 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030780AbbJ3NpT (ORCPT ); Fri, 30 Oct 2015 09:45:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1446212719; x=1477748719; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=toU9QvAsqDN4d1wRIcYYjN0rL9GSO97iYhFLX4jkC7M=; b=Phs0M7IKwtL9+smmZvypi5DF7JELyqaBhG79jsxo2+OhaKU8PlcYCOGt hb8t6u3vSb4dkBVpTn87Aqhex6dZLDAU72xoNZkeB9V+UBrQO75dmpYPt SjmIc4IS3vBBcSfmGw/ja0EdV5mULT5/HoEvrPrj2nUX0wgQoo9v6QsDt U=; X-IronPort-AV: E=McAfee;i="5700,7163,7969"; a="146890789" Received: from ironmsg04-l-new.qualcomm.com (HELO Ironmsg04-L.qualcomm.com) ([10.53.140.111]) by wolverine01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 30 Oct 2015 06:45:19 -0700 X-IronPort-AV: E=Sophos;i="5.20,218,1444719600"; d="scan'208";a="1000352250" Received: from nasanexm01b.na.qualcomm.com ([10.85.0.82]) by Ironmsg04-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 30 Oct 2015 06:45:18 -0700 Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by NASANEXM01B.na.qualcomm.com (10.85.0.82) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Fri, 30 Oct 2015 06:45:17 -0700 Received: from usdutt-linux.qualcomm.com (10.80.80.8) by aphydexm01f.ap.qualcomm.com (10.252.127.15) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Fri, 30 Oct 2015 19:15:08 +0530 From: Sunil Dutt To: CC: , , , , Subject: [PATCH v2 2/2] mac80211: Add support for aborting an ongoing scan Date: Fri, 30 Oct 2015 19:14:50 +0530 Message-ID: <1446212690-326-2-git-send-email-usdutt@qti.qualcomm.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1446212690-326-1-git-send-email-usdutt@qti.qualcomm.com> References: <1446212690-326-1-git-send-email-usdutt@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) To aphydexm01f.ap.qualcomm.com (10.252.127.15) 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Vidyullatha Kanchanapally This commit adds implementation for abort scan in mac80211. Reviewed-by: Jouni Malinen Signed-off-by: Vidyullatha Kanchanapally Signed-off-by: Sunil Dutt --- v2: Change return value of ieee80211_abort_scan to void net/mac80211/cfg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 713cdbf..4eda313 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3797,6 +3797,15 @@ static int ieee80211_del_tx_ts(struct wiphy *wiphy, struct net_device *dev, return -ENOENT; } +static void ieee80211_abort_scan(struct wiphy *wiphy, struct net_device *dev) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; + + /* Cancel the ongoing scan */ + ieee80211_scan_cancel(local); +} + const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, @@ -3881,4 +3890,5 @@ const struct cfg80211_ops mac80211_config_ops = { .set_ap_chanwidth = ieee80211_set_ap_chanwidth, .add_tx_ts = ieee80211_add_tx_ts, .del_tx_ts = ieee80211_del_tx_ts, + .abort_scan = ieee80211_abort_scan, };