diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-13 00:32:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:07:07 -0500 |
| commit | 860621347e88b23517fc4ec93fa5af940401c3ec (patch) | |
| tree | 059223640a79bfe60f0dd9fe3c15d5656cac740a /drivers/net/wireless/libertas/main.c | |
| parent | 020f3d0001cb249ceae623c1a7ae0c196326ef3f (diff) | |
libertas: pass channel argument directly to lbs_mesh_config()
There is weirdness here; the firmware seems to refuse to change channels
at will.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 2409df85c2e0..9232b975a42c 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
| @@ -344,7 +344,7 @@ static ssize_t lbs_mesh_set(struct device *dev, | |||
| 344 | if (enable == !!priv->mesh_dev) | 344 | if (enable == !!priv->mesh_dev) |
| 345 | return count; | 345 | return count; |
| 346 | 346 | ||
| 347 | ret = lbs_mesh_config(priv, enable); | 347 | ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel); |
| 348 | if (ret) | 348 | if (ret) |
| 349 | return ret; | 349 | return ret; |
| 350 | 350 | ||
| @@ -1187,9 +1187,9 @@ int lbs_start_card(struct lbs_private *priv) | |||
| 1187 | 1187 | ||
| 1188 | lbs_update_channel(priv); | 1188 | lbs_update_channel(priv); |
| 1189 | priv->mesh_tlv = 0x100 + 291; | 1189 | priv->mesh_tlv = 0x100 + 291; |
| 1190 | if (lbs_mesh_config(priv, 1)) { | 1190 | if (lbs_mesh_config(priv, 1, priv->curbssparams.channel)) { |
| 1191 | priv->mesh_tlv = 0x100 + 37; | 1191 | priv->mesh_tlv = 0x100 + 37; |
| 1192 | if (lbs_mesh_config(priv, 1)) | 1192 | if (lbs_mesh_config(priv, 1, priv->curbssparams.channel)) |
| 1193 | priv->mesh_tlv = 0; | 1193 | priv->mesh_tlv = 0; |
| 1194 | } | 1194 | } |
| 1195 | if (priv->mesh_tlv) { | 1195 | if (priv->mesh_tlv) { |