4 files changed, 1 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 13f6528abb00..4a8f5dc70239 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -240,7 +240,7 @@ static int wlan_cmd_802_11_enable_rsn(wlan_private * priv,
                 if (*enable)
                         penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
                 else
-                        penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
+                        penableRSN->enable = cpu_to_le16(cmd_disable_rsn);
         }
 
         lbs_deb_leave(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 88d9d2d787d5..769c86fb9509 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
         ret = 0;
 
 done:
-        skb->protocol = __constant_htons(0x0019);       /* ETH_P_80211_RAW */
         lbs_deb_leave_args(LBS_DEB_RX, "ret %d", ret);
         return ret;
 }
diff --git a/drivers/net/wireless/libertas/version.h b/drivers/net/wireless/libertas/version.h
deleted file mode 100644
index 8b137891791f..000000000000
--- a/drivers/net/wireless/libertas/version.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index f42b796b5e47..2fcc3bf21081 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/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 */