catch up with mextadd callback taking a void argument instead of a caddr_t.
This commit is contained in:
parent
8243fdf19a
commit
69a3693f3e
@ -149,7 +149,7 @@ static int sk_newbuf (struct sk_if_softc *,
|
|||||||
struct sk_chain *, struct mbuf *);
|
struct sk_chain *, struct mbuf *);
|
||||||
static int sk_alloc_jumbo_mem (struct sk_if_softc *);
|
static int sk_alloc_jumbo_mem (struct sk_if_softc *);
|
||||||
static void *sk_jalloc (struct sk_if_softc *);
|
static void *sk_jalloc (struct sk_if_softc *);
|
||||||
static void sk_jfree (caddr_t, void *);
|
static void sk_jfree (void *, void *);
|
||||||
static int sk_init_rx_ring (struct sk_if_softc *);
|
static int sk_init_rx_ring (struct sk_if_softc *);
|
||||||
static void sk_init_tx_ring (struct sk_if_softc *);
|
static void sk_init_tx_ring (struct sk_if_softc *);
|
||||||
static u_int32_t sk_win_read_4 (struct sk_softc *, int);
|
static u_int32_t sk_win_read_4 (struct sk_softc *, int);
|
||||||
@ -795,7 +795,7 @@ static void *sk_jalloc(sc_if)
|
|||||||
* Release a jumbo buffer.
|
* Release a jumbo buffer.
|
||||||
*/
|
*/
|
||||||
static void sk_jfree(buf, args)
|
static void sk_jfree(buf, args)
|
||||||
caddr_t buf;
|
void *buf;
|
||||||
void *args;
|
void *args;
|
||||||
{
|
{
|
||||||
struct sk_if_softc *sc_if;
|
struct sk_if_softc *sc_if;
|
||||||
|
@ -85,10 +85,10 @@ extern vm_offset_t sf_base;
|
|||||||
#define dtosf(x) (&sf_bufs[((uintptr_t)(x) - (uintptr_t)sf_base) >> PAGE_SHIFT])
|
#define dtosf(x) (&sf_bufs[((uintptr_t)(x) - (uintptr_t)sf_base) >> PAGE_SHIFT])
|
||||||
void sf_buf_free(caddr_t addr, void *args);
|
void sf_buf_free(caddr_t addr, void *args);
|
||||||
struct sf_buf *sf_buf_alloc(void);
|
struct sf_buf *sf_buf_alloc(void);
|
||||||
static void socow_iodone(caddr_t addr, void *args);
|
static void socow_iodone(void *addr, void *args);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
socow_iodone(caddr_t addr, void *args)
|
socow_iodone(void *addr, void *args)
|
||||||
{
|
{
|
||||||
int s;
|
int s;
|
||||||
struct sf_buf *sf;
|
struct sf_buf *sf;
|
||||||
|
@ -140,7 +140,7 @@ jumbo_vm_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
jumbo_freem(caddr_t addr, void *args)
|
jumbo_freem(void *addr, void *args)
|
||||||
{
|
{
|
||||||
vm_page_t frame;
|
vm_page_t frame;
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ static int sk_newbuf (struct sk_if_softc *,
|
|||||||
struct sk_chain *, struct mbuf *);
|
struct sk_chain *, struct mbuf *);
|
||||||
static int sk_alloc_jumbo_mem (struct sk_if_softc *);
|
static int sk_alloc_jumbo_mem (struct sk_if_softc *);
|
||||||
static void *sk_jalloc (struct sk_if_softc *);
|
static void *sk_jalloc (struct sk_if_softc *);
|
||||||
static void sk_jfree (caddr_t, void *);
|
static void sk_jfree (void *, void *);
|
||||||
static int sk_init_rx_ring (struct sk_if_softc *);
|
static int sk_init_rx_ring (struct sk_if_softc *);
|
||||||
static void sk_init_tx_ring (struct sk_if_softc *);
|
static void sk_init_tx_ring (struct sk_if_softc *);
|
||||||
static u_int32_t sk_win_read_4 (struct sk_softc *, int);
|
static u_int32_t sk_win_read_4 (struct sk_softc *, int);
|
||||||
@ -795,7 +795,7 @@ static void *sk_jalloc(sc_if)
|
|||||||
* Release a jumbo buffer.
|
* Release a jumbo buffer.
|
||||||
*/
|
*/
|
||||||
static void sk_jfree(buf, args)
|
static void sk_jfree(buf, args)
|
||||||
caddr_t buf;
|
void *buf;
|
||||||
void *args;
|
void *args;
|
||||||
{
|
{
|
||||||
struct sk_if_softc *sc_if;
|
struct sk_if_softc *sc_if;
|
||||||
|
@ -53,7 +53,7 @@ jumbo_phys_to_kva(vm_offset_t pa)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int jumbo_vm_init(void);
|
int jumbo_vm_init(void);
|
||||||
void jumbo_freem(caddr_t addr, void *args);
|
void jumbo_freem(void *addr, void *args);
|
||||||
vm_page_t jumbo_pg_alloc(void);
|
vm_page_t jumbo_pg_alloc(void);
|
||||||
void jumbo_pg_free(vm_offset_t addr);
|
void jumbo_pg_free(vm_offset_t addr);
|
||||||
void jumbo_pg_steal(vm_page_t pg);
|
void jumbo_pg_steal(vm_page_t pg);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user