diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 23:36:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 23:36:22 -0400 |
| commit | 3752aee96538b582b089f4a97a26e2ccd9403929 (patch) | |
| tree | 162601df617d057d1c56bc120d742c6322b0ebc3 /drivers | |
| parent | 4ed4b5475211fab6a0ad00eed2f9297395e7598e (diff) | |
| parent | 888454c57a45511808d3fa52597b3d765df034a6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
[NETFILTER]: xt_quota: add missing module aliases
[ATM]: [he] don't hold the device lock when upcalling
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atm/he.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index dd96123a2b7f..ffcb9fd31c38 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -1928,7 +1928,9 @@ he_service_rbrq(struct he_dev *he_dev, int group) | |||
| 1928 | #ifdef notdef | 1928 | #ifdef notdef |
| 1929 | ATM_SKB(skb)->vcc = vcc; | 1929 | ATM_SKB(skb)->vcc = vcc; |
| 1930 | #endif | 1930 | #endif |
| 1931 | spin_unlock(&he_dev->global_lock); | ||
| 1931 | vcc->push(vcc, skb); | 1932 | vcc->push(vcc, skb); |
| 1933 | spin_lock(&he_dev->global_lock); | ||
| 1932 | 1934 | ||
| 1933 | atomic_inc(&vcc->stats->rx); | 1935 | atomic_inc(&vcc->stats->rx); |
| 1934 | 1936 | ||