forked from Minki/linux
f444de05d2
Currently (all tested with hwsim) you can do stupid things like setting up an AP on a certain channel, then adding another virtual interface and making that associate on another channel -- this will make the beaconing to move channel but obviously without the necessary IEs data update. In order to improve this situation, first make the configuration APIs (cfg80211 and nl80211) aware of multi-channel operation -- we'll eventually need that in the future anyway. There's one userland API change and one API addition. The API change is that now SET_WIPHY must be called with virtual interface index rather than only wiphy index in order to take effect for that interface -- luckily all current users (hostapd) do that. For monitor interfaces, the old setting is preserved, but monitors are always slaved to other devices anyway so no guarantees. The second userland API change is the introduction of a per virtual interface SET_CHANNEL command, that hostapd should use going forward to make it easier to understand what's going on (it can automatically detect a kernel with this command). Other than mac80211, no existing cfg80211 drivers are affected by this change because they only allow a single virtual interface. mac80211, however, now needs to be aware that the channel settings are per interface now, and needs to disallow (for now) real multi-channel operation, which is another important part of this patch. One of the immediate benefits is that you can now start hostapd to operate on a hardware that already has a connection on another virtual interface, as long as you specify the same channel. Note that two things are left unhandled (this is an improvement -- not a complete fix): * different HT/no-HT modes currently you could start an HT AP and then connect to a non-HT network on the same channel which would configure the hardware for no HT; that can be fixed fairly easily * CSA An AP we're connected to on a virtual interface might indicate switching channels, and in that case we would follow it, regardless of how many other interfaces are operating; this requires more effort to fix but is pretty rare after all Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
291 lines
6.4 KiB
C
291 lines
6.4 KiB
C
/* cfg80211 support
|
|
*
|
|
* See copyright notice in main.c
|
|
*/
|
|
#include <linux/ieee80211.h>
|
|
#include <net/cfg80211.h>
|
|
#include "hw.h"
|
|
#include "main.h"
|
|
#include "orinoco.h"
|
|
|
|
#include "cfg.h"
|
|
|
|
/* Supported bitrates. Must agree with hw.c */
|
|
static struct ieee80211_rate orinoco_rates[] = {
|
|
{ .bitrate = 10 },
|
|
{ .bitrate = 20 },
|
|
{ .bitrate = 55 },
|
|
{ .bitrate = 110 },
|
|
};
|
|
|
|
static const void * const orinoco_wiphy_privid = &orinoco_wiphy_privid;
|
|
|
|
/* Called after orinoco_private is allocated. */
|
|
void orinoco_wiphy_init(struct wiphy *wiphy)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
|
|
wiphy->privid = orinoco_wiphy_privid;
|
|
|
|
set_wiphy_dev(wiphy, priv->dev);
|
|
}
|
|
|
|
/* Called after firmware is initialised */
|
|
int orinoco_wiphy_register(struct wiphy *wiphy)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
int i, channels = 0;
|
|
|
|
if (priv->firmware_type == FIRMWARE_TYPE_AGERE)
|
|
wiphy->max_scan_ssids = 1;
|
|
else
|
|
wiphy->max_scan_ssids = 0;
|
|
|
|
wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
|
|
|
|
/* TODO: should we set if we only have demo ad-hoc?
|
|
* (priv->has_port3)
|
|
*/
|
|
if (priv->has_ibss)
|
|
wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
|
|
|
|
if (!priv->broken_monitor || force_monitor)
|
|
wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);
|
|
|
|
priv->band.bitrates = orinoco_rates;
|
|
priv->band.n_bitrates = ARRAY_SIZE(orinoco_rates);
|
|
|
|
/* Only support channels allowed by the card EEPROM */
|
|
for (i = 0; i < NUM_CHANNELS; i++) {
|
|
if (priv->channel_mask & (1 << i)) {
|
|
priv->channels[i].center_freq =
|
|
ieee80211_dsss_chan_to_freq(i+1);
|
|
channels++;
|
|
}
|
|
}
|
|
priv->band.channels = priv->channels;
|
|
priv->band.n_channels = channels;
|
|
|
|
wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
|
|
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
|
|
|
|
i = 0;
|
|
if (priv->has_wep) {
|
|
priv->cipher_suites[i] = WLAN_CIPHER_SUITE_WEP40;
|
|
i++;
|
|
|
|
if (priv->has_big_wep) {
|
|
priv->cipher_suites[i] = WLAN_CIPHER_SUITE_WEP104;
|
|
i++;
|
|
}
|
|
}
|
|
if (priv->has_wpa) {
|
|
priv->cipher_suites[i] = WLAN_CIPHER_SUITE_TKIP;
|
|
i++;
|
|
}
|
|
wiphy->cipher_suites = priv->cipher_suites;
|
|
wiphy->n_cipher_suites = i;
|
|
|
|
wiphy->rts_threshold = priv->rts_thresh;
|
|
if (!priv->has_mwo)
|
|
wiphy->frag_threshold = priv->frag_thresh + 1;
|
|
wiphy->retry_short = priv->short_retry_limit;
|
|
wiphy->retry_long = priv->long_retry_limit;
|
|
|
|
return wiphy_register(wiphy);
|
|
}
|
|
|
|
static int orinoco_change_vif(struct wiphy *wiphy, struct net_device *dev,
|
|
enum nl80211_iftype type, u32 *flags,
|
|
struct vif_params *params)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
int err = 0;
|
|
unsigned long lock;
|
|
|
|
if (orinoco_lock(priv, &lock) != 0)
|
|
return -EBUSY;
|
|
|
|
switch (type) {
|
|
case NL80211_IFTYPE_ADHOC:
|
|
if (!priv->has_ibss && !priv->has_port3)
|
|
err = -EINVAL;
|
|
break;
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
break;
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
if (priv->broken_monitor && !force_monitor) {
|
|
printk(KERN_WARNING "%s: Monitor mode support is "
|
|
"buggy in this firmware, not enabling\n",
|
|
wiphy_name(wiphy));
|
|
err = -EINVAL;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
err = -EINVAL;
|
|
}
|
|
|
|
if (!err) {
|
|
priv->iw_mode = type;
|
|
set_port_type(priv);
|
|
err = orinoco_commit(priv);
|
|
}
|
|
|
|
orinoco_unlock(priv, &lock);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
|
|
struct cfg80211_scan_request *request)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
int err;
|
|
|
|
if (!request)
|
|
return -EINVAL;
|
|
|
|
if (priv->scan_request && priv->scan_request != request)
|
|
return -EBUSY;
|
|
|
|
priv->scan_request = request;
|
|
|
|
err = orinoco_hw_trigger_scan(priv, request->ssids);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int orinoco_set_channel(struct wiphy *wiphy,
|
|
struct net_device *netdev,
|
|
struct ieee80211_channel *chan,
|
|
enum nl80211_channel_type channel_type)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
int err = 0;
|
|
unsigned long flags;
|
|
int channel;
|
|
|
|
if (!chan)
|
|
return -EINVAL;
|
|
|
|
if (channel_type != NL80211_CHAN_NO_HT)
|
|
return -EINVAL;
|
|
|
|
if (chan->band != IEEE80211_BAND_2GHZ)
|
|
return -EINVAL;
|
|
|
|
channel = ieee80211_freq_to_dsss_chan(chan->center_freq);
|
|
|
|
if ((channel < 1) || (channel > NUM_CHANNELS) ||
|
|
!(priv->channel_mask & (1 << (channel-1))))
|
|
return -EINVAL;
|
|
|
|
if (orinoco_lock(priv, &flags) != 0)
|
|
return -EBUSY;
|
|
|
|
priv->channel = channel;
|
|
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {
|
|
/* Fast channel change - no commit if successful */
|
|
hermes_t *hw = &priv->hw;
|
|
err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST |
|
|
HERMES_TEST_SET_CHANNEL,
|
|
channel, NULL);
|
|
}
|
|
orinoco_unlock(priv, &flags);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int orinoco_set_wiphy_params(struct wiphy *wiphy, u32 changed)
|
|
{
|
|
struct orinoco_private *priv = wiphy_priv(wiphy);
|
|
int frag_value = -1;
|
|
int rts_value = -1;
|
|
int err = 0;
|
|
|
|
if (changed & WIPHY_PARAM_RETRY_SHORT) {
|
|
/* Setting short retry not supported */
|
|
err = -EINVAL;
|
|
}
|
|
|
|
if (changed & WIPHY_PARAM_RETRY_LONG) {
|
|
/* Setting long retry not supported */
|
|
err = -EINVAL;
|
|
}
|
|
|
|
if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {
|
|
/* Set fragmentation */
|
|
if (priv->has_mwo) {
|
|
if (wiphy->frag_threshold < 0)
|
|
frag_value = 0;
|
|
else {
|
|
printk(KERN_WARNING "%s: Fixed fragmentation "
|
|
"is not supported on this firmware. "
|
|
"Using MWO robust instead.\n",
|
|
priv->ndev->name);
|
|
frag_value = 1;
|
|
}
|
|
} else {
|
|
if (wiphy->frag_threshold < 0)
|
|
frag_value = 2346;
|
|
else if ((wiphy->frag_threshold < 257) ||
|
|
(wiphy->frag_threshold > 2347))
|
|
err = -EINVAL;
|
|
else
|
|
/* cfg80211 value is 257-2347 (odd only)
|
|
* orinoco rid has range 256-2346 (even only) */
|
|
frag_value = wiphy->frag_threshold & ~0x1;
|
|
}
|
|
}
|
|
|
|
if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
|
|
/* Set RTS.
|
|
*
|
|
* Prism documentation suggests default of 2432,
|
|
* and a range of 0-3000.
|
|
*
|
|
* Current implementation uses 2347 as the default and
|
|
* the upper limit.
|
|
*/
|
|
|
|
if (wiphy->rts_threshold < 0)
|
|
rts_value = 2347;
|
|
else if (wiphy->rts_threshold > 2347)
|
|
err = -EINVAL;
|
|
else
|
|
rts_value = wiphy->rts_threshold;
|
|
}
|
|
|
|
if (!err) {
|
|
unsigned long flags;
|
|
|
|
if (orinoco_lock(priv, &flags) != 0)
|
|
return -EBUSY;
|
|
|
|
if (frag_value >= 0) {
|
|
if (priv->has_mwo)
|
|
priv->mwo_robust = frag_value;
|
|
else
|
|
priv->frag_thresh = frag_value;
|
|
}
|
|
if (rts_value >= 0)
|
|
priv->rts_thresh = rts_value;
|
|
|
|
err = orinoco_commit(priv);
|
|
|
|
orinoco_unlock(priv, &flags);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
const struct cfg80211_ops orinoco_cfg_ops = {
|
|
.change_virtual_intf = orinoco_change_vif,
|
|
.set_channel = orinoco_set_channel,
|
|
.scan = orinoco_scan,
|
|
.set_wiphy_params = orinoco_set_wiphy_params,
|
|
};
|