Skip to content

Commit 228bd62

Browse files
committed
Merge tag 'staging-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fix from Greg KH: "Here is a single staging driver fix, for the wlan-ng driver, that resolves a reported issue. It is been in linux-next for a while with no reported issues" * tag 'staging-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS
2 parents 13fa692 + 153c5d8 commit 228bd62

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/staging/wlan-ng/cfg80211.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,8 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
469469
/* Set the encryption - we only support wep */
470470
if (is_wep) {
471471
if (sme->key) {
472-
if (sme->key_idx >= NUM_WEPKEYS) {
473-
err = -EINVAL;
474-
goto exit;
475-
}
472+
if (sme->key_idx >= NUM_WEPKEYS)
473+
return -EINVAL;
476474

477475
result = prism2_domibset_uint32(wlandev,
478476
DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

0 commit comments

Comments
 (0)