diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:11:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:11:50 -0700 |
| commit | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (patch) | |
| tree | f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 /drivers/atm | |
| parent | 3863e72414fa2ebf5f3b615d1bf99de32e59980a (diff) | |
| parent | d70063c4634af060a5387337b7632f6334ca3458 (diff) | |
| download | linux-stable-48467641bcc057f7cba3b6cbbe66cb834d64cc81.tar.gz linux-stable-48467641bcc057f7cba3b6cbbe66cb834d64cc81.tar.bz2 linux-stable-48467641bcc057f7cba3b6cbbe66cb834d64cc81.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/zatm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index c4b75ecf9460..55959e4d1cb7 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -417,9 +417,9 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]); chan = (here[3] & uPD98401_AAL5_CHAN) >> uPD98401_AAL5_CHAN_SHIFT; if (chan < zatm_dev->chans && zatm_dev->rx_map[chan]) { - int pos = ZATM_VCC(vcc)->pool; - + int pos; vcc = zatm_dev->rx_map[chan]; + pos = ZATM_VCC(vcc)->pool; if (skb == zatm_dev->last_free[pos]) zatm_dev->last_free[pos] = NULL; skb_unlink(skb, zatm_dev->pool + pos); |