Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32087
b: refs/heads/master
c: 4359219
h: refs/heads/master
i:
  32085: 1dbb21a
  32083: 0418144
  32079: a56cdb5
v: v3
  • Loading branch information
Daniel Drake authored and Jeff Garzik committed Jul 5, 2006
1 parent b8fd841 commit 7899466
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d41e2651080c717c1b48389fe4171180388f042
refs/heads/master: 4359219425a0918a72775480e125fbb077de338d
4 changes: 4 additions & 0 deletions trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 7899466

Please sign in to comment.