1 files changed, 19 insertions, 14 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index d8f5600578b4..df317c1e12a8 100644
--- 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);
@@ -1885,6 +1885,15 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
 
         spin_lock(&bcm->irq_lock);
 
+        /* Only accept IRQs, if we are initialized properly.
+         * This avoids an RX race while initializing.
+         * We should probably not enable IRQs before we are initialized
+         * completely, but some careful work is needed to fix this. I think it
+         * is best to stay with this cheap workaround for now... .
+         */
+        if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED))
+                goto out;
+
         reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
         if (reason == 0xffffffff) {
                 /* irq not for us (shared irq) */
@@ -1906,19 +1915,11 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
 
         bcm43xx_interrupt_ack(bcm, reason);
 
-        /* Only accept IRQs, if we are initialized properly.
-         * This avoids an RX race while initializing.
-         * We should probably not enable IRQs before we are initialized
-         * completely, but some careful work is needed to fix this. I think it
-         * is best to stay with this cheap workaround for now... .
-         */
-        if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) {
-                /* disable all IRQs. They are enabled again in the bottom half. */
-                bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-                /* save the reason code and call our bottom half. */
-                bcm->irq_reason = reason;
-                tasklet_schedule(&bcm->isr_tasklet);
-        }
+        /* disable all IRQs. They are enabled again in the bottom half. */
+        bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+        /* save the reason code and call our bottom half. */
+        bcm->irq_reason = reason;
+        tasklet_schedule(&bcm->isr_tasklet);
 
 out:
         mmiowb();
@@ -3698,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) {