diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-25 14:05:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-25 14:05:24 -0700 |
| commit | 7466a38478a30d5f7248134c9bdcb4e1c01fe4d9 (patch) | |
| tree | 636c0b584aa950ec02fde32393c8ce9f273c746f /drivers/net/wimax | |
| parent | a261af927df64523925c98369106de15af9d7b5e (diff) | |
| parent | 3a24934f065d23145f1c9c70da9f630c7a37795f (diff) | |
| download | op-kernel-dev-7466a38478a30d5f7248134c9bdcb4e1c01fe4d9.zip op-kernel-dev-7466a38478a30d5f7248134c9bdcb4e1c01fe4d9.tar.gz | |
Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax')
| -rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 6537593..8cc9e31 100644 --- 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); |
