Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b5c41651645f7604dda7abc3445e1622f9b1b9ab
Commit:     b5c41651645f7604dda7abc3445e1622f9b1b9ab
Parent:     44956855ff9e21f58633a628b6b64e549a2fa0ed
Author:     Dan Williams <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 13 14:00:22 2007 -0500
Committer:  John W. Linville <[EMAIL PROTECTED]>
CommitDate: Wed Feb 14 15:45:04 2007 -0500

    [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths
    
    Correct assignment of DOT1XENABLE in WE-19 codepaths.
    RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
    vice versa.  The original WE-19 patch erroneously reversed that.  This
    patch fixes association with unencrypted and WEP networks when using
    wpa_supplicant.
    
    It also adds two missing break statements that, left out, could result
    in incorrect card configuration.
    
    Signed-off-by: Dan Williams <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/prism54/isl_ioctl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c 
b/drivers/net/wireless/prism54/isl_ioctl.c
index 838d510..841b3c1 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;
                }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to