Since the previous patch, the struct only has a single member, so remove the struct and leave just the single member. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
		
			
				
	
	
		
			150 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2002-2005, Instant802 Networks, Inc.
 | |
|  * Copyright 2005, Devicescape Software, Inc.
 | |
|  * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  */
 | |
| 
 | |
| #ifndef IEEE80211_RATE_H
 | |
| #define IEEE80211_RATE_H
 | |
| 
 | |
| #include <linux/netdevice.h>
 | |
| #include <linux/skbuff.h>
 | |
| #include <linux/types.h>
 | |
| #include <net/mac80211.h>
 | |
| #include "ieee80211_i.h"
 | |
| #include "sta_info.h"
 | |
| #include "driver-ops.h"
 | |
| 
 | |
| struct rate_control_ref {
 | |
| 	struct ieee80211_local *local;
 | |
| 	const struct rate_control_ops *ops;
 | |
| 	void *priv;
 | |
| };
 | |
| 
 | |
| void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
 | |
| 			   struct sta_info *sta,
 | |
| 			   struct ieee80211_tx_rate_control *txrc);
 | |
| 
 | |
| static inline void rate_control_tx_status(struct ieee80211_local *local,
 | |
| 					  struct ieee80211_supported_band *sband,
 | |
| 					  struct sta_info *sta,
 | |
| 					  struct sk_buff *skb)
 | |
| {
 | |
| 	struct rate_control_ref *ref = local->rate_ctrl;
 | |
| 	struct ieee80211_sta *ista = &sta->sta;
 | |
| 	void *priv_sta = sta->rate_ctrl_priv;
 | |
| 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 | |
| 
 | |
| 	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
 | |
| 		return;
 | |
| 
 | |
| 	spin_lock_bh(&sta->rate_ctrl_lock);
 | |
| 	if (ref->ops->tx_status)
 | |
| 		ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
 | |
| 	else
 | |
| 		ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
 | |
| 	spin_unlock_bh(&sta->rate_ctrl_lock);
 | |
| }
 | |
| 
 | |
| static inline void
 | |
| rate_control_tx_status_noskb(struct ieee80211_local *local,
 | |
| 			     struct ieee80211_supported_band *sband,
 | |
| 			     struct sta_info *sta,
 | |
| 			     struct ieee80211_tx_info *info)
 | |
| {
 | |
| 	struct rate_control_ref *ref = local->rate_ctrl;
 | |
| 	struct ieee80211_sta *ista = &sta->sta;
 | |
| 	void *priv_sta = sta->rate_ctrl_priv;
 | |
| 
 | |
| 	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
 | |
| 		return;
 | |
| 
 | |
| 	if (WARN_ON_ONCE(!ref->ops->tx_status_noskb))
 | |
| 		return;
 | |
| 
 | |
| 	spin_lock_bh(&sta->rate_ctrl_lock);
 | |
| 	ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
 | |
| 	spin_unlock_bh(&sta->rate_ctrl_lock);
 | |
| }
 | |
| 
 | |
| void rate_control_rate_init(struct sta_info *sta);
 | |
| void rate_control_rate_update(struct ieee80211_local *local,
 | |
| 				    struct ieee80211_supported_band *sband,
 | |
| 				    struct sta_info *sta, u32 changed);
 | |
| 
 | |
| static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
 | |
| 					   struct sta_info *sta, gfp_t gfp)
 | |
| {
 | |
| 	spin_lock_init(&sta->rate_ctrl_lock);
 | |
| 	return ref->ops->alloc_sta(ref->priv, &sta->sta, gfp);
 | |
| }
 | |
| 
 | |
| static inline void rate_control_free_sta(struct sta_info *sta)
 | |
| {
 | |
| 	struct rate_control_ref *ref = sta->rate_ctrl;
 | |
| 	struct ieee80211_sta *ista = &sta->sta;
 | |
| 	void *priv_sta = sta->rate_ctrl_priv;
 | |
| 
 | |
| 	ref->ops->free_sta(ref->priv, ista, priv_sta);
 | |
| }
 | |
| 
 | |
| static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
 | |
| {
 | |
| #ifdef CONFIG_MAC80211_DEBUGFS
 | |
| 	struct rate_control_ref *ref = sta->rate_ctrl;
 | |
| 	if (ref && sta->debugfs_dir && ref->ops->add_sta_debugfs)
 | |
| 		ref->ops->add_sta_debugfs(ref->priv, sta->rate_ctrl_priv,
 | |
| 					  sta->debugfs_dir);
 | |
| #endif
 | |
| }
 | |
| 
 | |
| static inline void rate_control_remove_sta_debugfs(struct sta_info *sta)
 | |
| {
 | |
| #ifdef CONFIG_MAC80211_DEBUGFS
 | |
| 	struct rate_control_ref *ref = sta->rate_ctrl;
 | |
| 	if (ref && ref->ops->remove_sta_debugfs)
 | |
| 		ref->ops->remove_sta_debugfs(ref->priv, sta->rate_ctrl_priv);
 | |
| #endif
 | |
| }
 | |
| 
 | |
| /* Get a reference to the rate control algorithm. If `name' is NULL, get the
 | |
|  * first available algorithm. */
 | |
| int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
 | |
| 				 const char *name);
 | |
| void rate_control_deinitialize(struct ieee80211_local *local);
 | |
| 
 | |
| 
 | |
| /* Rate control algorithms */
 | |
| #ifdef CONFIG_MAC80211_RC_MINSTREL
 | |
| int rc80211_minstrel_init(void);
 | |
| void rc80211_minstrel_exit(void);
 | |
| #else
 | |
| static inline int rc80211_minstrel_init(void)
 | |
| {
 | |
| 	return 0;
 | |
| }
 | |
| static inline void rc80211_minstrel_exit(void)
 | |
| {
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_MAC80211_RC_MINSTREL_HT
 | |
| int rc80211_minstrel_ht_init(void);
 | |
| void rc80211_minstrel_ht_exit(void);
 | |
| #else
 | |
| static inline int rc80211_minstrel_ht_init(void)
 | |
| {
 | |
| 	return 0;
 | |
| }
 | |
| static inline void rc80211_minstrel_ht_exit(void)
 | |
| {
 | |
| }
 | |
| #endif
 | |
| 
 | |
| 
 | |
| #endif /* IEEE80211_RATE_H */
 |