Merge trivial low-risk suspend hotkey bugzilla-5918 into release

[linux-2.6] / drivers / net / wireless / bcm43xx / bcm43xx_main.c

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 673ab11d92abc658bd758214ffd6df6500b93540..df317c1e12a89df16d84ce861ffac7d302cea8ad 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -1547,7 +1547,7 @@ static void handle_irq_noise(struct bcm43xx_private *bcm)
                goto generate_new;
 
        /* Get the noise samples. */
-       assert(bcm->noisecalc.nr_samples <= 8);
+       assert(bcm->noisecalc.nr_samples < 8);
        i = bcm->noisecalc.nr_samples;
        noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
        noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
@@ -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", sec->auth_mode);
+       }
        dprintk("\n");
        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&
            !bcm->ieee->host_encrypt) {