From 789946650e9bd4593a133eccdd9fc05a74bfed23 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Fri, 16 Jun 2006 20:50:22 +0100 Subject: [PATCH] --- yaml --- r: 32087 b: refs/heads/master c: 4359219425a0918a72775480e125fbb077de338d h: refs/heads/master i: 32085: 1dbb21ae740d468662677fdec37de65907cd24da 32083: 0418144d8889f7d3f1eec90851964ce2d0f5c2c7 32079: a56cdb51af1b03fcd2aff78eb616f67f0fa94698 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8f415154d62..928b06897db2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d41e2651080c717c1b48389fe4171180388f042 +refs/heads/master: 4359219425a0918a72775480e125fbb077de338d diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 673ab11d92ab..e1c5a939bca4 100644 --- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -3699,6 +3699,10 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, secinfo->encrypt = sec->encrypt; dprintk(", .encrypt = %d", sec->encrypt); } + if (sec->flags & SEC_AUTH_MODE) { + secinfo->auth_mode = sec->auth_mode; + dprintk(", .auth_mode = %d\n", sec->auth_mode); + } dprintk("\n"); if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED && !bcm->ieee->host_encrypt) {