diff options
Diffstat (limited to 'drivers/net/wireless/prism54')
-rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 4 |
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, | |||
1395 | break; | 1395 | break; |
1396 | 1396 | ||
1397 | case IW_AUTH_RX_UNENCRYPTED_EAPOL: | 1397 | case IW_AUTH_RX_UNENCRYPTED_EAPOL: |
1398 | dot1x = param->value ? 1 : 0; | 1398 | /* dot1x should be the opposite of RX_UNENCRYPTED_EAPOL; |
1399 | * turn off dot1x when allowing receipt of unencrypted EAPOL | ||
1400 | * frames, turn on dot1x when receipt should be disallowed | ||
1401 | */ | ||
1402 | dot1x = param->value ? 0 : 0x01; | ||
1399 | break; | 1403 | break; |
1400 | 1404 | ||
1401 | case IW_AUTH_PRIVACY_INVOKED: | 1405 | case IW_AUTH_PRIVACY_INVOKED: |
1402 | privinvoked = param->value ? 1 : 0; | 1406 | privinvoked = param->value ? 1 : 0; |
1407 | break; | ||
1403 | 1408 | ||
1404 | case IW_AUTH_DROP_UNENCRYPTED: | 1409 | case IW_AUTH_DROP_UNENCRYPTED: |
1405 | exunencrypt = param->value ? 1 : 0; | 1410 | exunencrypt = param->value ? 1 : 0; |
@@ -1589,6 +1594,7 @@ static int prism54_set_encodeext(struct net_device *ndev, | |||
1589 | } | 1594 | } |
1590 | key.type = DOT11_PRIV_TKIP; | 1595 | key.type = DOT11_PRIV_TKIP; |
1591 | key.length = KEY_SIZE_TKIP; | 1596 | key.length = KEY_SIZE_TKIP; |
1597 | break; | ||
1592 | default: | 1598 | default: |
1593 | return -EINVAL; | 1599 | return -EINVAL; |
1594 | } | 1600 | } |
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 @@ | |||
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kernel.h> | ||
20 | |||
19 | #include "prismcompat.h" | 21 | #include "prismcompat.h" |
20 | #include "islpci_dev.h" | 22 | #include "islpci_dev.h" |
21 | #include "islpci_mgt.h" | 23 | #include "islpci_mgt.h" |
@@ -692,7 +694,7 @@ mgt_update_addr(islpci_private *priv) | |||
692 | return ret; | 694 | return ret; |
693 | } | 695 | } |
694 | 696 | ||
695 | #define VEC_SIZE(a) (sizeof(a)/sizeof(a[0])) | 697 | #define VEC_SIZE(a) ARRAY_SIZE(a) |
696 | 698 | ||
697 | int | 699 | int |
698 | mgt_commit(islpci_private *priv) | 700 | mgt_commit(islpci_private *priv) |