diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:32:29 -0400 |
| commit | 5b84b6fa9b96d1598eb77196f9d8b3e62efac647 (patch) | |
| tree | c8bae5786c369e42ac7eba9191fbad0721bcd73c /drivers/net/wireless/bcm43xx/bcm43xx_main.c | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
| parent | ca0084fa90533687b6317e6d084141da87c74d5c (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_main.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 3889f79e7128..df317c1e12a8 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
| @@ -3701,7 +3701,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, | |||
| 3701 | } | 3701 | } |
| 3702 | if (sec->flags & SEC_AUTH_MODE) { | 3702 | if (sec->flags & SEC_AUTH_MODE) { |
| 3703 | secinfo->auth_mode = sec->auth_mode; | 3703 | secinfo->auth_mode = sec->auth_mode; |
| 3704 | dprintk(", .auth_mode = %d\n", sec->auth_mode); | 3704 | dprintk(", .auth_mode = %d", sec->auth_mode); |
| 3705 | } | 3705 | } |
| 3706 | dprintk("\n"); | 3706 | dprintk("\n"); |
| 3707 | if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED && | 3707 | if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED && |