Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...

[pandora-kernel.git] / drivers / net / wimax / i2400m / rx.c

diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 6537593..8cc9e31 100644 (file)
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1027,12 +1027,12 @@ void i2400m_rx_edata(struct i2400m *i2400m, struct sk_buff *skb_rx,
                ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN;
 
                spin_lock_irqsave(&i2400m->rx_lock, flags);
-               roq = &i2400m->rx_roq[ro_cin];
-               if (roq == NULL) {
+               if (i2400m->rx_roq == NULL) {
                        kfree_skb(skb); /* rx_roq is already destroyed */
                        spin_unlock_irqrestore(&i2400m->rx_lock, flags);
                        goto error;
                }
+               roq = &i2400m->rx_roq[ro_cin];
                kref_get(&i2400m->rx_roq_refcount);
                spin_unlock_irqrestore(&i2400m->rx_lock, flags);