diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 15:06:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 15:06:13 -0400 |
| commit | 416512cb75f51f3d12e5e1aa57b6a36760fd12c9 (patch) | |
| tree | f8081ffd9ce0b7a5867d5ad262345c222122abb6 /drivers/net/wireless/bcm43xx | |
| parent | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (diff) | |
| parent | ca0084fa90533687b6317e6d084141da87c74d5c (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wireless/bcm43xx')
| -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 ef9bc80bee01..ab3a0ee9fac8 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
| @@ -3702,7 +3702,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, | |||
| 3702 | } | 3702 | } |
| 3703 | if (sec->flags & SEC_AUTH_MODE) { | 3703 | if (sec->flags & SEC_AUTH_MODE) { |
| 3704 | secinfo->auth_mode = sec->auth_mode; | 3704 | secinfo->auth_mode = sec->auth_mode; |
| 3705 | dprintk(", .auth_mode = %d\n", sec->auth_mode); | 3705 | dprintk(", .auth_mode = %d", sec->auth_mode); |
| 3706 | } | 3706 | } |
| 3707 | dprintk("\n"); | 3707 | dprintk("\n"); |
| 3708 | if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED && | 3708 | if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED && |