Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
This commit is contained in:
commit
7466a38478
|
@ -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;
|
ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN;
|
||||||
|
|
||||||
spin_lock_irqsave(&i2400m->rx_lock, flags);
|
spin_lock_irqsave(&i2400m->rx_lock, flags);
|
||||||
roq = &i2400m->rx_roq[ro_cin];
|
if (i2400m->rx_roq == NULL) {
|
||||||
if (roq == NULL) {
|
|
||||||
kfree_skb(skb); /* rx_roq is already destroyed */
|
kfree_skb(skb); /* rx_roq is already destroyed */
|
||||||
spin_unlock_irqrestore(&i2400m->rx_lock, flags);
|
spin_unlock_irqrestore(&i2400m->rx_lock, flags);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
roq = &i2400m->rx_roq[ro_cin];
|
||||||
kref_get(&i2400m->rx_roq_refcount);
|
kref_get(&i2400m->rx_roq_refcount);
|
||||||
spin_unlock_irqrestore(&i2400m->rx_lock, flags);
|
spin_unlock_irqrestore(&i2400m->rx_lock, flags);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue