git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a261af9
)
Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...
author
David S. Miller
<davem@davemloft.net>
Tue, 25 May 2010 21:05:24 +0000
(14:05 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 25 May 2010 21:05:24 +0000
(14:05 -0700)
drivers/net/wimax/i2400m/rx.c
patch
|
blob
|
history
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);