From 5cf33627836acafd666b9d5e64673e634709c735 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 1 Jul 2007 22:20:40 +0200 Subject: [PATCH] --- yaml --- r: 60477 b: refs/heads/master c: 6b62472a5ff9605aafa43a0a341c32127821f7b2 h: refs/heads/master i: 60475: 9e1faf915302090be6c73f885452c8a55d286853 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/wext.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9ed207666e80..d6ddd346554b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74553aedd46b3a2cae986f909cf2a3f99369decc +refs/heads/master: 6b62472a5ff9605aafa43a0a341c32127821f7b2 diff --git a/trunk/drivers/net/wireless/libertas/wext.c b/trunk/drivers/net/wireless/libertas/wext.c index f42b796b5e47..2fcc3bf21081 100644 --- a/trunk/drivers/net/wireless/libertas/wext.c +++ b/trunk/drivers/net/wireless/libertas/wext.c @@ -1719,9 +1719,6 @@ static int wlan_set_encodeext(struct net_device *dev, pkey->type = KEY_TYPE_ID_TKIP; } else if (alg == IW_ENCODE_ALG_CCMP) { pkey->type = KEY_TYPE_ID_AES; - } else { - ret = -EINVAL; - goto out; } /* If WPA isn't enabled yet, do that now */