From patchwork Thu Jun 5 23:16:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 4309191 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 9BC459F326 for ; Thu, 5 Jun 2014 23:16:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BAFC32017E for ; Thu, 5 Jun 2014 23:16:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A65FC20120 for ; Thu, 5 Jun 2014 23:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685AbaFEXQW (ORCPT ); Thu, 5 Jun 2014 19:16:22 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:8416 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752044AbaFEXQV convert rfc822-to-8bit (ORCPT ); Thu, 5 Jun 2014 19:16:21 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.14.5/8.14.5) with SMTP id s55NGIo4030323; Thu, 5 Jun 2014 16:16:18 -0700 Received: from sc-owa.marvell.com ([199.233.58.135]) by mx0b-0016f401.pphosted.com with ESMTP id 1madcs4x6e-49 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 05 Jun 2014 16:16:18 -0700 Received: from SC-VEXCH1.marvell.com ([10.93.76.137]) by SC-OWA.marvell.com ([::1]) with mapi; Thu, 5 Jun 2014 16:16:11 -0700 From: Bing Zhao To: Johannes Berg , "linux-wireless@vger.kernel.org" CC: Johannes Berg , Amitkumar Karwar Date: Thu, 5 Jun 2014 16:16:11 -0700 Subject: RE: [PATCH] cfg80211: make ethtool the driver's responsibility Thread-Topic: [PATCH] cfg80211: make ethtool the driver's responsibility Thread-Index: Ac+ACwngprRrCP+gTnKc1Uq7uMtN8gBBCv1Q Message-ID: <477F20668A386D41ADCC57781B1F70430FE1BF2FB7@SC-VEXCH1.marvell.com> References: <1401896290-12942-1-git-send-email-johannes@sipsolutions.net> In-Reply-To: <1401896290-12942-1-git-send-email-johannes@sipsolutions.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52, 1.0.14, 0.0.0000 definitions=2014-06-05_06:2014-06-05, 2014-06-05, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1406050277 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Hi Johannes, > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index 920ec8c1ce54..5c17b1f71dd4 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -2278,16 +2278,6 @@ struct cfg80211_qos_map { > * > * @set_noack_map: Set the NoAck Map for the TIDs. > * > - * @get_et_sset_count: Ethtool API to get string-set count. > - * See @ethtool_ops.get_sset_count > - * > - * @get_et_stats: Ethtool API to get a set of u64 stats. > - * See @ethtool_ops.get_ethtool_stats > - * > - * @get_et_strings: Ethtool API to get a set of strings to describe stats > - * and perhaps other supported types of ethtool data-sets. > - * See @ethtool_ops.get_strings > - * > * @get_channel: Get the current operating channel for the virtual interface. > * For monitor interfaces, it should return %NULL unless there's a single > * current monitoring channel. > @@ -2529,13 +2519,6 @@ struct cfg80211_ops { > struct net_device *dev, > u16 noack_map); > > - int (*get_et_sset_count)(struct wiphy *wiphy, > - struct net_device *dev, int sset); > - void (*get_et_stats)(struct wiphy *wiphy, struct net_device *dev, > - struct ethtool_stats *stats, u64 *data); > - void (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev, > - u32 sset, u8 *data); > - > int (*get_channel)(struct wiphy *wiphy, > struct wireless_dev *wdev, > struct cfg80211_chan_def *chandef); Amitkumar found that set_ringparam and get_ringparam are forgotten to be removed from cfg80211_ops. Thanks, Bing --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index dc93c6b..29cb4b2 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2266,10 +2266,6 @@ struct cfg80211_qos_map { * * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant). * - * @set_ringparam: Set tx and rx ring sizes. - * - * @get_ringparam: Get tx and rx ring current and maximum sizes. - * * @tdls_mgmt: Transmit a TDLS management frame. * @tdls_oper: Perform a high-level TDLS operation (e.g. TDLS link setup). * @@ -2493,10 +2489,6 @@ struct cfg80211_ops { int (*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant); int (*get_antenna)(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant); - int (*set_ringparam)(struct wiphy *wiphy, u32 tx, u32 rx); - void (*get_ringparam)(struct wiphy *wiphy, - u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max); - int (*sched_scan_start)(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_sched_scan_request *request);