summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>2007-06-17 00:33:34 +0000
committerMatt Jacob <mjacob@FreeBSD.org>2007-06-17 00:33:34 +0000
commit27d65ef26791ef5368f36d176829e0053e30cfef (patch)
treeef006a65be5ba83f44569680a1997fde16ea0537
parentfbdd20a1aea2d009a35d24197a92020ebde79c7c (diff)
Notes
-rw-r--r--sys/netinet/ip_dummynet.c2
-rw-r--r--sys/netinet/ip_dummynet.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 7af8f210dc40..bc3100ff0740 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -1696,7 +1696,7 @@ config_pipe(struct dn_pipe *p)
*/
pipe->idle_heap.size = pipe->idle_heap.elements = 0;
pipe->idle_heap.offset =
- OFFSET_OF(struct dn_flow_queue, heap_pos);
+ offsetof(struct dn_flow_queue, heap_pos);
} else
/* Flush accumulated credit for all queues. */
for (i = 0; i <= pipe->fs.rq_size; i++)
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index de12c65aaecc..5215d932f49b 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -70,11 +70,6 @@ typedef u_int64_t dn_key ; /* sorting key */
* virtual time wraps every 15 days.
*/
-/*
- * The OFFSET_OF macro is used to return the offset of a field within
- * a structure. It is used by the heap management routines.
- */
-#define OFFSET_OF(type, field) ((int)&( ((type *)0)->field) )
/*
* The maximum hash table size for queues. This value must be a power