diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-18 06:14:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-18 06:14:33 +0200 |
| commit | ffc7a8649426f666818b63915b0f43fdf1757242 (patch) | |
| tree | 13cf20a85b94bd99166053866a4b6c0b9c541946 /drivers | |
| parent | bridge: fix initial packet flood if !STP (diff) | |
| parent | wimax/i2400m: fix device crash: fix optimization in _roq_queue_update_ws (diff) | |
| download | linux-ffc7a8649426f666818b63915b0f43fdf1757242.tar.xz linux-ffc7a8649426f666818b63915b0f43fdf1757242.zip | |
Merge branch 'linux-2.6.30.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 02419bfd64b5..f9fc38902322 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c @@ -819,10 +819,9 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq, roq_data = (struct i2400m_roq_data *) &skb->cb; i2400m_net_erx(i2400m, skb, roq_data->cs); } - else { + else __i2400m_roq_queue(i2400m, roq, skb, sn, nsn); - __i2400m_roq_update_ws(i2400m, roq, sn + 1); - } + __i2400m_roq_update_ws(i2400m, roq, sn + 1); i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_PACKET_WS, old_ws, len, sn, nsn, roq->ws); } |