cfg80211: make ethtool the driver's responsibility

Commit Message

Bing Zhao June 5, 2014, 11:16 p.m. UTC

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 [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Johannes Berg June 6, 2014, 6:10 a.m. UTC | #1

On Thu, 2014-06-05 at 16:16 -0700, Bing Zhao wrote:
> Hi Johannes,

> Amitkumar found that set_ringparam and get_ringparam are forgotten to be removed from cfg80211_ops.
> 
> 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.

Oops, good catch, thanks!

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);