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

diff --combined drivers/net/wimax/i2400m/rx.c
index 6537593,6cd12d6..8cc9e31
--- 1/drivers/net/wimax/i2400m/rx.c
--- 2/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@@ -317,6 -317,7 +317,6 @@@ error_waiter_cancelled
                kfree_skb(ack_skb);
  error_no_waiter:
        spin_unlock_irqrestore(&i2400m->rx_lock, flags);
 -      return;
  }
  
  
@@@ -721,6 -722,7 +721,6 @@@ void __i2400m_roq_queue(struct i2400m *
  out:
        d_fnend(4, dev, "(i2400m %p roq %p skb %p sn %u nsn %d) = void\n",
                i2400m, roq, skb, sn, nsn);
 -      return;
  }
  
  
@@@ -800,6 -802,7 +800,6 @@@ void i2400m_roq_reset(struct i2400m *i2
        }
        roq->ws = 0;
        d_fnend(2, dev, "(i2400m %p roq %p) = void\n", i2400m, roq);
 -      return;
  }
  
  
@@@ -838,6 -841,7 +838,6 @@@ void i2400m_roq_queue(struct i2400m *i2
        }
        d_fnend(2, dev, "(i2400m %p roq %p skb %p lbn %u) = void\n",
                i2400m, roq, skb, lbn);
 -      return;
  }
  
  
@@@ -863,6 -867,7 +863,6 @@@ void i2400m_roq_update_ws(struct i2400
        i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_WS,
                             old_ws, len, sn, nsn, roq->ws);
        d_fnstart(2, dev, "(i2400m %p roq %p sn %u) = void\n", i2400m, roq, sn);
 -      return;
  }
  
  
@@@ -912,6 -917,7 +912,6 @@@ void i2400m_roq_queue_update_ws(struct 
  
        d_fnend(2, dev, "(i2400m %p roq %p skb %p sn %u) = void\n",
                i2400m, roq, skb, sn);
 -      return;
  }
  
  
@@@ -1027,12 -1033,12 +1027,12 @@@ void i2400m_rx_edata(struct i2400m *i24
                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);
  
@@@ -1073,6 -1079,7 +1073,6 @@@ error_skb_clone
  error:
        d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p "
                "size %zu) = void\n", i2400m, skb_rx, single_last, payload, size);
 -      return;
  }