From patchwork Mon Sep 12 09:38:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prameela Rani Garnepudi X-Patchwork-Id: 9326035 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E54F860231 for ; Mon, 12 Sep 2016 09:43:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6BFC28CAB for ; Mon, 12 Sep 2016 09:43:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB62128CB1; Mon, 12 Sep 2016 09:43:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D263128CAE for ; Mon, 12 Sep 2016 09:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757469AbcILJn3 (ORCPT ); Mon, 12 Sep 2016 05:43:29 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:36033 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbcILJn1 (ORCPT ); Mon, 12 Sep 2016 05:43:27 -0400 Received: by mail-pa0-f67.google.com with SMTP id p2so1326131pap.3 for ; Mon, 12 Sep 2016 02:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=50VCNPA5CKkv+38OE4aqPaktuaE88Wc376LK+Je3jD4=; b=k2yVqm9jn/D73NwutPukOoOd2x9icz8YrIgngk2k4e3L8UDWHGQMfLyog8cwVYEeLI UmwgTb9X4WOzlkMX94NFfWQqzaoWpWNMMZ2zr8oGqvF1Jjbiu3f34Ld24fcPxbGW93Qu qBl3eC90qtHWyFEo4P4PgV/8SAPS3xhxEb3S6gcgwb8Qr414Do1hLazddwazArte526T Ym3cUqVnEoRCDBt9dIURu7imLePkYXqMuvhNJL6qDz0kDdMft9XeMlLu8yCZjmk0qOZS Fj7wpkFLdGCP0tf/rsqNaCrjcp6D2bL4VIH6NO4BVJ05BOQ2kd17w50YXTV7neameFmQ QXYA== 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:in-reply-to:references; bh=50VCNPA5CKkv+38OE4aqPaktuaE88Wc376LK+Je3jD4=; b=IrIwWiwKnQT0rM2/eWoh9ZYCdXyqACAw0nBKN4r95kUvCwHsti1JMbvSJ8dOUlkjIj UQLMUD47ce5cREBW53RV3MtvEDmuqowd+aA7g5sUaSpaqDnmCdByhjOKUuJjgyfssgF5 wFMb+v9FSrXCs+LKRm2msvGGQIDQW0dwSgRBfGHhNd1SA8D9ksSdqNMckNTCXqODofZu HRUz14e7oiZW5xCHBSbew0NHPjBK/t1lSsnxis0LLO6k7xt6y7fYacmfLdSj/RA7CC31 6Cmm2nn0qn6b7nxoiitY//7IMOBkiNKC+sS7XJKtaRGoBsyxQf+4aPeLEwaLi8S+5m8k /Ycg== X-Gm-Message-State: AE9vXwNFcrOBuoTBrQXzGyzCNrdwOm05ADE/E9rzAdqRfvnoHdJ7dOK8c9FK6fybFO3K/w== X-Received: by 10.66.144.227 with SMTP id sp3mr31830498pab.131.1473673401875; Mon, 12 Sep 2016 02:43:21 -0700 (PDT) Received: from lapt225.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id 10sm21920168paq.20.2016.09.12.02.43.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 02:43:21 -0700 (PDT) From: Prameela Rani Garnepudi To: linux-wireless@vger.kernel.org, kvalo@codeaurora.org, johannes.berg@intel.com, hofrat@osadl.org Cc: prameela.j04cs@gmail.com, prameela.garnepudi@redpinesignals.com Subject: [PATCH 3/9] rsi: Added freeing of allocated buffers (sbands and dfsentry) Cleanup (spelling mistakes, code format corrections, empty lines after declaration) Date: Mon, 12 Sep 2016 15:08:18 +0530 Message-Id: <9e848b4549d9e919eb3a772e0d292db5eee39b43.1473669618.git.prameela.j04cs@gmail.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Prameela Rani Garnepudi --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index dbb2389..29abedc 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -194,6 +194,7 @@ static void rsi_register_rates_channels(struct rsi_hw *adapter, int band) void rsi_mac80211_detach(struct rsi_hw *adapter) { struct ieee80211_hw *hw = adapter->hw; + int i; if (hw) { ieee80211_stop_queues(hw); @@ -201,7 +202,17 @@ void rsi_mac80211_detach(struct rsi_hw *adapter) ieee80211_free_hw(hw); } + for(i = 0; i < 2; i++) { + struct ieee80211_supported_band *sbands = &adapter->sbands[i]; + + if (sbands->channels) + kfree(sbands->channels); + } + +#ifdef CONFIG_RSI_DEBUGFS rsi_remove_dbgfs(adapter); + kfree(adapter->dfsentry); +#endif } EXPORT_SYMBOL_GPL(rsi_mac80211_detach); @@ -304,7 +315,8 @@ static int rsi_mac80211_add_interface(struct ieee80211_hw *hw, if (!adapter->sc_nvifs) { ++adapter->sc_nvifs; adapter->vifs[0] = vif; - ret = rsi_set_vap_capabilities(common, STA_OPMODE); + ret = rsi_set_vap_capabilities(common, + STA_OPMODE); } break; default: @@ -429,9 +441,11 @@ static int rsi_mac80211_config(struct ieee80211_hw *hw, u16 rsi_get_connected_channel(struct rsi_hw *adapter) { struct ieee80211_vif *vif = adapter->vifs[0]; + if (vif) { struct ieee80211_bss_conf *bss = &vif->bss_conf; struct ieee80211_channel *channel = bss->chandef.chan; + return channel->hw_value; } @@ -819,8 +833,6 @@ static void rsi_perform_cqm(struct rsi_common *common, common->cqm_info.last_cqm_event_rssi = rssi; rsi_dbg(INFO_ZONE, "CQM: Notifying event: %d\n", event); ieee80211_cqm_rssi_notify(adapter->vifs[0], event, GFP_KERNEL); - - return; } /** @@ -875,16 +887,14 @@ static void rsi_fill_rx_status(struct ieee80211_hw *hw, } /* CQM only for connected AP beacons, the RSSI is a weighted avg */ - if (bss->assoc && !(memcmp(bss->bssid, hdr->addr2, ETH_ALEN))) { + if (bss->assoc && ether_addr_equal(bss->bssid, hdr->addr2)) { if (ieee80211_is_beacon(hdr->frame_control)) rsi_perform_cqm(common, hdr->addr2, rxs->signal); } - - return; } /** - * rsi_indicate_pkt_to_os() - This function sends recieved packet to mac80211. + * rsi_indicate_pkt_to_os() - This function sends received packet to mac80211. * @common: Pointer to the driver private structure. * @skb: Pointer to the socket buffer structure. *