aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-10-08 05:07:27 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:55:19 -0400
commit6470a89de90167cc1ff8a0312197ca422f5fe35f (patch)
treec83fcadf4252e2be9655f25283b359d2958b1c97
parent2bcde51d095490c223bb4ade351cb7981c367934 (diff)
[PATCH] libertas: fix u8 constant
Don't write constants that are (per documentation and struct) u8 as 0x0001, use 0x01 instead. Also remove an useless cast. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-By: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/cmd.c4
-rw-r--r--drivers/net/wireless/libertas/host.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 33dbed09fc72..1cbbd96fdbde 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -181,13 +181,13 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,
181 181
182 switch (pkey->len) { 182 switch (pkey->len) {
183 case KEY_LEN_WEP_40: 183 case KEY_LEN_WEP_40:
184 wep->keytype[i] = (u8)CMD_TYPE_WEP_40_BIT; 184 wep->keytype[i] = CMD_TYPE_WEP_40_BIT;
185 memmove(&wep->keymaterial[i], pkey->key, 185 memmove(&wep->keymaterial[i], pkey->key,
186 pkey->len); 186 pkey->len);
187 lbs_deb_cmd("SET_WEP: add key %d (40 bit)\n", i); 187 lbs_deb_cmd("SET_WEP: add key %d (40 bit)\n", i);
188 break; 188 break;
189 case KEY_LEN_WEP_104: 189 case KEY_LEN_WEP_104:
190 wep->keytype[i] = (u8)CMD_TYPE_WEP_104_BIT; 190 wep->keytype[i] = CMD_TYPE_WEP_104_BIT;
191 memmove(&wep->keymaterial[i], pkey->key, 191 memmove(&wep->keymaterial[i], pkey->key,
192 pkey->len); 192 pkey->len);
193 lbs_deb_cmd("SET_WEP: add key %d (104 bit)\n", i); 193 lbs_deb_cmd("SET_WEP: add key %d (104 bit)\n", i);
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 68fa11b3a2dc..b37ddbca969f 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -138,8 +138,8 @@
138#define CMD_ACT_REMOVE 0x0004 138#define CMD_ACT_REMOVE 0x0004
139#define CMD_ACT_USE_DEFAULT 0x0008 139#define CMD_ACT_USE_DEFAULT 0x0008
140 140
141#define CMD_TYPE_WEP_40_BIT 0x0001 141#define CMD_TYPE_WEP_40_BIT 0x01
142#define CMD_TYPE_WEP_104_BIT 0x0002 142#define CMD_TYPE_WEP_104_BIT 0x02
143 143
144#define CMD_NUM_OF_WEP_KEYS 4 144#define CMD_NUM_OF_WEP_KEYS 4
145 145