diff options
| author | David Gibson | 2005-05-13 02:03:36 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-05-13 02:03:36 +0200 |
| commit | d51d8b1f249b23a717ae489d6ccf2c25030988e6 (patch) | |
| tree | 2fe062e1eb563e0223193c851ddacd9bf6791203 | |
| parent | [PATCH] Orinoco: kill dump_recs (diff) | |
| download | kernel-qcow2-linux-d51d8b1f249b23a717ae489d6ccf2c25030988e6.tar.gz kernel-qcow2-linux-d51d8b1f249b23a717ae489d6ccf2c25030988e6.tar.xz kernel-qcow2-linux-d51d8b1f249b23a717ae489d6ccf2c25030988e6.zip | |
[PATCH] Orinoco: don't set channel in managed mode
Don't attempt to manually set the channel in infrastructure mode, the
firmware doesn't like that much. Also don't attempt to override the
firmware's default channel number for IBSS mode (I believe default
channel can vary by regulatory domain).
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 6e4d0e7d43a9..b79aebf83e47 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -1615,17 +1615,15 @@ static int __orinoco_program_rids(struct net_device *dev) return err; } /* Set the channel/frequency */ - if (priv->channel == 0) { - printk(KERN_DEBUG "%s: Channel is 0 in __orinoco_program_rids()\n", dev->name); - if (priv->createibss) - priv->channel = 10; - } - err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFOWNCHANNEL, - priv->channel); - if (err) { - printk(KERN_ERR "%s: Error %d setting channel\n", - dev->name, err); - return err; + if (priv->channel != 0 && priv->iw_mode != IW_MODE_INFRA) { + err = hermes_write_wordrec(hw, USER_BAP, + HERMES_RID_CNFOWNCHANNEL, + priv->channel); + if (err) { + printk(KERN_ERR "%s: Error %d setting channel %d\n", + dev->name, err, priv->channel); + return err; + } } if (priv->has_ibss) { @@ -2405,7 +2403,7 @@ static int orinoco_init(struct net_device *dev) /* By default use IEEE/IBSS ad-hoc mode if we have it */ priv->prefer_port3 = priv->has_port3 && (! priv->has_ibss); set_port_type(priv); - priv->channel = 10; /* default channel, more-or-less arbitrary */ + priv->channel = 0; /* use firmware default */ priv->promiscuous = 0; priv->wep_on = 0; |