Merge branch 'upstream' into upstream-jgarzik

Conflicts:

	net/ieee80211/softmac/ieee80211softmac_module.c
	net/ieee80211/softmac/ieee80211softmac_wx.c

2 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 838d510213c6..841b3c136ad9 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1395,11 +1395,16 @@ static int prism54_set_auth(struct net_device *ndev,
                 break;
 
         case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-                dot1x = param->value ? 1 : 0;
+                /* dot1x should be the opposite of RX_UNENCRYPTED_EAPOL;
+                 * turn off dot1x when allowing receipt of unencrypted EAPOL
+                 * frames, turn on dot1x when receipt should be disallowed
+                 */
+                dot1x = param->value ? 0 : 0x01;
                 break;
 
         case IW_AUTH_PRIVACY_INVOKED:
                 privinvoked = param->value ? 1 : 0;
+                break;
 
         case IW_AUTH_DROP_UNENCRYPTED:
                 exunencrypt = param->value ? 1 : 0;
@@ -1589,6 +1594,7 @@ static int prism54_set_encodeext(struct net_device *ndev,
                         }
                         key.type = DOT11_PRIV_TKIP;
                         key.length = KEY_SIZE_TKIP;
+                        break;
                 default:
                         return -EINVAL;
                 }
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index e6cf9df2c206..42780320cd5c 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -16,6 +16,8 @@
  *
  */
 
+#include <linux/kernel.h>
+
 #include "prismcompat.h"
 #include "islpci_dev.h"
 #include "islpci_mgt.h"
@@ -692,7 +694,7 @@ mgt_update_addr(islpci_private *priv)
         return ret;
 }
 
-#define VEC_SIZE(a) (sizeof(a)/sizeof(a[0]))
+#define VEC_SIZE(a) ARRAY_SIZE(a)
 
 int
 mgt_commit(islpci_private *priv)