aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap/hostap_hw.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-12-21 03:30:16 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:05 -0500
commit8a9faf3cd08b91aca1502dbe18e3b5063fda2e87 (patch)
tree4588f25ca8cd11833252370c3b0c7566004de050 /drivers/net/wireless/hostap/hostap_hw.c
parent3eb9b41f2474c53fe469fbe383955d5aae9e76e4 (diff)
hostap annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_hw.c')
-rw-r--r--drivers/net/wireless/hostap/hostap_hw.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 700a9c34815b..77237bb3b2f9 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1075,7 +1075,7 @@ static int prism2_setup_rids(struct net_device *dev)
1075{ 1075{
1076 struct hostap_interface *iface; 1076 struct hostap_interface *iface;
1077 local_info_t *local; 1077 local_info_t *local;
1078 u16 tmp; 1078 __le16 tmp;
1079 int ret = 0; 1079 int ret = 0;
1080 1080
1081 iface = netdev_priv(dev); 1081 iface = netdev_priv(dev);
@@ -1084,11 +1084,11 @@ static int prism2_setup_rids(struct net_device *dev)
1084 hostap_set_word(dev, HFA384X_RID_TICKTIME, 2000); 1084 hostap_set_word(dev, HFA384X_RID_TICKTIME, 2000);
1085 1085
1086 if (!local->fw_ap) { 1086 if (!local->fw_ap) {
1087 tmp = hostap_get_porttype(local); 1087 u16 tmp1 = hostap_get_porttype(local);
1088 ret = hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, tmp); 1088 ret = hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, tmp1);
1089 if (ret) { 1089 if (ret) {
1090 printk("%s: Port type setting to %d failed\n", 1090 printk("%s: Port type setting to %d failed\n",
1091 dev->name, tmp); 1091 dev->name, tmp1);
1092 goto fail; 1092 goto fail;
1093 } 1093 }
1094 } 1094 }
@@ -1117,7 +1117,7 @@ static int prism2_setup_rids(struct net_device *dev)
1117 ret = -EINVAL; 1117 ret = -EINVAL;
1118 goto fail; 1118 goto fail;
1119 } 1119 }
1120 local->channel_mask = __le16_to_cpu(tmp); 1120 local->channel_mask = le16_to_cpu(tmp);
1121 1121
1122 if (local->channel < 1 || local->channel > 14 || 1122 if (local->channel < 1 || local->channel > 14 ||
1123 !(local->channel_mask & (1 << (local->channel - 1)))) { 1123 !(local->channel_mask & (1 << (local->channel - 1)))) {