Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6470a89d authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[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: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-By: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2bcde51d

drivers/net/wireless/libertas/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -181,13 +181,13 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv, 


			switch (pkey->len) {

			case KEY_LEN_WEP_40:

				wep->keytype[i] = (u8)CMD_TYPE_WEP_40_BIT;

				wep->keytype[i] = CMD_TYPE_WEP_40_BIT;

				memmove(&wep->keymaterial[i], pkey->key,

				        pkey->len);

				lbs_deb_cmd("SET_WEP: add key %d (40 bit)\n", i);

				break;

			case KEY_LEN_WEP_104:

				wep->keytype[i] = (u8)CMD_TYPE_WEP_104_BIT;

				wep->keytype[i] = CMD_TYPE_WEP_104_BIT;

				memmove(&wep->keymaterial[i], pkey->key,

				        pkey->len);

				lbs_deb_cmd("SET_WEP: add key %d (104 bit)\n", i);

drivers/net/wireless/libertas/host.h

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ 
#define CMD_ACT_REMOVE                      0x0004

#define CMD_ACT_USE_DEFAULT                 0x0008



#define CMD_TYPE_WEP_40_BIT                 0x0001

#define CMD_TYPE_WEP_104_BIT                0x0002

#define CMD_TYPE_WEP_40_BIT                 0x01

#define CMD_TYPE_WEP_104_BIT                0x02



#define CMD_NUM_OF_WEP_KEYS                 4