4fa0043731
Handling HT configuration changes involved setting the channel with the new HT parameters and then issuing a rate_update() notification to the driver. This behavior changed after the off-channel changes. Now, the channel is not updated with the new HT params in enable_ht() - instead, it is now done when the scan work terminates. This results in the driver depending on stale information, defaulting to non-HT mode always. Fix this by passing the new channel type to the driver. Cc: stable@kernel.org Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
152 lines
4.0 KiB
C
152 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 <linux/kref.h>
|
|
#include <net/mac80211.h>
|
|
#include "ieee80211_i.h"
|
|
#include "sta_info.h"
|
|
|
|
struct rate_control_ref {
|
|
struct ieee80211_local *local;
|
|
struct rate_control_ops *ops;
|
|
void *priv;
|
|
struct kref kref;
|
|
};
|
|
|
|
void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
|
|
struct sta_info *sta,
|
|
struct ieee80211_tx_rate_control *txrc);
|
|
struct rate_control_ref *rate_control_get(struct rate_control_ref *ref);
|
|
void rate_control_put(struct rate_control_ref *ref);
|
|
|
|
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;
|
|
|
|
if (!ref)
|
|
return;
|
|
|
|
ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
|
|
}
|
|
|
|
|
|
static inline void rate_control_rate_init(struct sta_info *sta)
|
|
{
|
|
struct ieee80211_local *local = sta->sdata->local;
|
|
struct rate_control_ref *ref = sta->rate_ctrl;
|
|
struct ieee80211_sta *ista = &sta->sta;
|
|
void *priv_sta = sta->rate_ctrl_priv;
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
if (!ref)
|
|
return;
|
|
|
|
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
|
|
|
ref->ops->rate_init(ref->priv, sband, ista, priv_sta);
|
|
}
|
|
|
|
static inline void rate_control_rate_update(struct ieee80211_local *local,
|
|
struct ieee80211_supported_band *sband,
|
|
struct sta_info *sta, u32 changed,
|
|
enum nl80211_channel_type oper_chan_type)
|
|
{
|
|
struct rate_control_ref *ref = local->rate_ctrl;
|
|
struct ieee80211_sta *ista = &sta->sta;
|
|
void *priv_sta = sta->rate_ctrl_priv;
|
|
|
|
if (ref && ref->ops->rate_update)
|
|
ref->ops->rate_update(ref->priv, sband, ista,
|
|
priv_sta, changed, oper_chan_type);
|
|
}
|
|
|
|
static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
|
|
struct ieee80211_sta *sta,
|
|
gfp_t gfp)
|
|
{
|
|
return ref->ops->alloc_sta(ref->priv, 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_PID
|
|
extern int rc80211_pid_init(void);
|
|
extern void rc80211_pid_exit(void);
|
|
#else
|
|
static inline int rc80211_pid_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void rc80211_pid_exit(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_MAC80211_RC_MINSTREL
|
|
extern int rc80211_minstrel_init(void);
|
|
extern void rc80211_minstrel_exit(void);
|
|
#else
|
|
static inline int rc80211_minstrel_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void rc80211_minstrel_exit(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
|
|
#endif /* IEEE80211_RATE_H */
|