summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams2007-12-11 23:35:51 +0100
committerDavid S. Miller2008-01-29 00:06:50 +0100
commitcb182a602802b36ff992afe238e1a3eafc0956b2 (patch)
tree3db0e5d2fafbbf937dbe0d8b086963f3835f0d2b
parentlibertas: convert RF_CHANNEL to a direct command (diff)
downloadkernel-qcow2-linux-cb182a602802b36ff992afe238e1a3eafc0956b2.tar.gz
kernel-qcow2-linux-cb182a602802b36ff992afe238e1a3eafc0956b2.tar.xz
kernel-qcow2-linux-cb182a602802b36ff992afe238e1a3eafc0956b2.zip
libertas: endianness fixes for get_channel/set_channel
Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/cmd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 32f9f880a15a..0f07c2ab9cac 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -831,8 +831,8 @@ int lbs_get_channel(struct lbs_private *priv)
if (ret)
goto out;
- lbs_deb_cmd("current radio channel is %d\n", cmd.channel);
- ret = (int) cmd.channel;
+ ret = le16_to_cpu(cmd.channel);
+ lbs_deb_cmd("current radio channel is %d\n", ret);
out:
lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
@@ -863,8 +863,9 @@ int lbs_set_channel(struct lbs_private *priv, u8 channel)
if (ret)
goto out;
- priv->curbssparams.channel = cmd.channel;
- lbs_deb_cmd("channel switch from %d to %d\n", old_channel, cmd.channel);
+ priv->curbssparams.channel = (uint8_t) le16_to_cpu(cmd.channel);
+ lbs_deb_cmd("channel switch from %d to %d\n", old_channel,
+ priv->curbssparams.channel);
out:
lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);