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

Commit 37f92cf0 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Improved case statements in p80211req_mibset_mibget() 



This patch improves code from p80211req_mibset_mibget() function by
taking into account that every
DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKeyX with
X in {0, 1, 2, 3} is a bit mask where the (P80211DID_MASK_ITEM <<
P80211DID_LSB_ITEM) mask aka 0x0x0003f000 mask keeps bits representing
the DID item number. To get this item number use P80211DID_ITEM().

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb14a0b4

drivers/staging/wlan-ng/p80211req.c

+9 −19
Original line number Diff line number Diff line
@@ -185,26 +185,16 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev, 
	u8 *key = mibitem->data + sizeof(p80211pstrd_t);



	switch (mibitem->did) {

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0:{

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0:

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1:

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:

		if (!isget)

			wep_change_key(wlandev, 0, key, pstr->len);

			wep_change_key(wlandev,

				       P80211DID_ITEM(mibitem->did) - 1,

				       key, pstr->len);

		break;

	}

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1:{

		if (!isget)

			wep_change_key(wlandev, 1, key, pstr->len);

	break;

	}

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:{

		if (!isget)

			wep_change_key(wlandev, 2, key, pstr->len);

	break;

	}

	case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:{

		if (!isget)

			wep_change_key(wlandev, 3, key, pstr->len);

	break;

	}



	case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{

		u32 *data = (u32 *) mibitem->data;