diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-09-27 02:27:05 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-09-27 02:27:05 +0000 |
| commit | d31c5bf256a32a98434c38f4d949adfecfca9f18 (patch) | |
| tree | e2bd2d6be9f0eeeabb1f6f6affdccc9bad05c540 /sys | |
| parent | 8f7a17ca6957d6f9f4899e5c9a1a1a9ba265cbb3 (diff) | |
fix the use of LIST_INSERT_HEAD in [m]sk_alloc_jumbo_mem().
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_sk.c | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 66e3316c86b..23a1daf8458 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.20 2006/09/26 19:37:28 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.21 2006/09/27 02:27:04 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -604,11 +604,7 @@ msk_alloc_jumbo_mem(struct sk_if_softc *sc_if) goto out; } entry->slot = i; - if (i) - LIST_INSERT_HEAD(&sc_if->sk_jfree_listhead, - entry, jpool_entries); - else - LIST_INSERT_HEAD(&sc_if->sk_jinuse_listhead, + LIST_INSERT_HEAD(&sc_if->sk_jfree_listhead, entry, jpool_entries); } out: @@ -668,7 +664,6 @@ msk_jfree(caddr_t buf, u_int size, void *arg) panic("sk_jfree: can't find softc pointer!"); /* calculate the slot this buffer belongs to */ - i = ((vaddr_t)buf - (vaddr_t)sc->sk_cdata.sk_jumbo_buf) / SK_JLEN; diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 482fb39c69c..8dfbbbd5370 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.127 2006/09/26 19:37:28 brad Exp $ */ +/* $OpenBSD: if_sk.c,v 1.128 2006/09/27 02:27:04 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -772,11 +772,7 @@ sk_alloc_jumbo_mem(struct sk_if_softc *sc_if) goto out; } entry->slot = i; - if (i) - LIST_INSERT_HEAD(&sc_if->sk_jfree_listhead, - entry, jpool_entries); - else - LIST_INSERT_HEAD(&sc_if->sk_jinuse_listhead, + LIST_INSERT_HEAD(&sc_if->sk_jfree_listhead, entry, jpool_entries); } out: @@ -836,7 +832,6 @@ sk_jfree(caddr_t buf, u_int size, void *arg) panic("sk_jfree: can't find softc pointer!"); /* calculate the slot this buffer belongs to */ - i = ((vaddr_t)buf - (vaddr_t)sc->sk_cdata.sk_jumbo_buf) / SK_JLEN; |