diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ic/bwi.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_san_xilinx.c | 4 | ||||
-rw-r--r-- | sys/net/bpf.c | 5 | ||||
-rw-r--r-- | sys/net/bpf.h | 5 | ||||
-rw-r--r-- | sys/net/if_pflow.c | 5 |
5 files changed, 15 insertions, 8 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index a7f5d403b6f..c584fccf396 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.82 2008/10/15 19:12:19 blambert Exp $ */ +/* $OpenBSD: bwi.c,v 1.83 2008/11/26 18:01:43 dlg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -99,6 +99,8 @@ int bwi_debug = 1; #define __unused __attribute__((__unused__)) +extern int ticks; + /* XXX end porting goop */ /* MAC */ diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c index bc0df31f743..83c3d6fe68b 100644 --- a/sys/dev/pci/if_san_xilinx.c +++ b/sys/dev/pci/if_san_xilinx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_xilinx.c,v 1.23 2008/09/18 15:16:30 naddy Exp $ */ +/* $OpenBSD: if_san_xilinx.c,v 1.24 2008/11/26 18:01:43 dlg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -192,6 +192,8 @@ typedef struct { extern void disable_irq(unsigned int); extern void enable_irq(unsigned int); +extern int ticks; + /**SECTOIN************************************************** * * Function Prototypes diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 0172c5d8f85..c2729b17027 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.70 2008/11/09 15:08:26 naddy Exp $ */ +/* $OpenBSD: bpf.c,v 1.71 2008/11/26 18:01:43 dlg Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -68,6 +68,9 @@ #define PRINET 26 /* interruptible */ +/* from kern/kern_clock.c; incremented each clock tick. */ +extern int ticks; + /* * The default read buffer size is patchable. */ diff --git a/sys/net/bpf.h b/sys/net/bpf.h index fcf4c2588ec..03b04d0c759 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.h,v 1.36 2008/11/09 15:08:26 naddy Exp $ */ +/* $OpenBSD: bpf.h,v 1.37 2008/11/26 18:01:43 dlg Exp $ */ /* $NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $ */ /* @@ -285,7 +285,4 @@ u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); */ #define BPF_MEMWORDS 16 -extern int ticks; /* from kern/kern_clock.c; incremented each */ - /* clock tick. */ - #endif /* _NET_BPF_H_ */ diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 515a31fed22..fb04229b7f5 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.7 2008/10/28 15:51:27 gollo Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.8 2008/11/26 18:01:43 dlg Exp $ */ /* * Copyright (c) 2008 Henning Brauer <henning@openbsd.org> @@ -91,6 +91,9 @@ struct if_clone pflow_cloner = extern int ipport_hifirstauto; extern int ipport_hilastauto; +/* from kern/kern_clock.c; incremented each clock tick. */ +extern int ticks; + void pflowattach(int npflow) { |