AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] Orinoco: don't set channel in managed mode

Browse Source 
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>
This commit is contained in:
David Gibson 2005-05-12 20:03:36 -04:00 committed by Jeff Garzik
parent 1fc5eb6428
commit d51d8b1f24
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/orinoco.c
View File

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