Module Name: src
Committed By: ozaki-r
Date: Mon Jun 16 00:40:10 UTC 2014
Modified Files:
src/sys/net: if.c if.h pktqueue.c pktqueue.h
Log Message:
Move sysctl_pktq_{maxlen,count} to pktqueue.c and make them global
They will be used by bridge.
ok rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/sys/net/if.c
cvs rdiff -u -r1.165 -r1.166 src/sys/net/if.h
cvs rdiff -u -r1.5 -r1.6 src/sys/net/pktqueue.c
cvs rdiff -u -r1.3 -r1.4 src/sys/net/pktqueue.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.281 src/sys/net/if.c:1.282
--- src/sys/net/if.c:1.281 Fri Jun 13 13:54:08 2014
+++ src/sys/net/if.c Mon Jun 16 00:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.281 2014/06/13 13:54:08 rmind Exp $ */
+/* $NetBSD: if.c,v 1.282 2014/06/16 00:40:10 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.281 2014/06/13 13:54:08 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.282 2014/06/16 00:40:10 ozaki-r Exp $");
#include "opt_inet.h"
@@ -2343,29 +2343,6 @@ bad:
#if defined(INET) || defined(INET6)
-static int
-sysctl_pktq_maxlen(SYSCTLFN_ARGS, pktqueue_t *pq)
-{
- u_int nmaxlen = pktq_get_count(pq, PKTQ_MAXLEN);
- struct sysctlnode node = *rnode;
- int error;
-
- node.sysctl_data = &nmaxlen;
- error = sysctl_lookup(SYSCTLFN_CALL(&node));
- if (error || newp == NULL)
- return error;
- return pktq_set_maxlen(pq, nmaxlen);
-}
-
-static int
-sysctl_pktq_count(SYSCTLFN_ARGS, pktqueue_t *pq, u_int count_id)
-{
- int count = pktq_get_count(pq, count_id);
- struct sysctlnode node = *rnode;
- node.sysctl_data = &count;
- return sysctl_lookup(SYSCTLFN_CALL(&node));
-}
-
#define SYSCTL_NET_PKTQ(q, cn, c) \
static int \
sysctl_net_##q##_##cn(SYSCTLFN_ARGS) \
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.165 src/sys/net/if.h:1.166
--- src/sys/net/if.h:1.165 Sun May 18 00:33:20 2014
+++ src/sys/net/if.h Mon Jun 16 00:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.165 2014/05/18 00:33:20 rmind Exp $ */
+/* $NetBSD: if.h,v 1.166 2014/06/16 00:40:10 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -79,8 +79,10 @@
#include <sys/socket.h>
#include <sys/queue.h>
+
#include <net/dlt.h>
#include <net/pfil.h>
+#include <net/pktqueue.h>
/*
* Always include ALTQ glue here -- we use the ALTQ interface queue
Index: src/sys/net/pktqueue.c
diff -u src/sys/net/pktqueue.c:1.5 src/sys/net/pktqueue.c:1.6
--- src/sys/net/pktqueue.c:1.5 Mon Jun 16 00:33:39 2014
+++ src/sys/net/pktqueue.c Mon Jun 16 00:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pktqueue.c,v 1.5 2014/06/16 00:33:39 ozaki-r Exp $ */
+/* $NetBSD: pktqueue.c,v 1.6 2014/06/16 00:40:10 ozaki-r Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.5 2014/06/16 00:33:39 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.6 2014/06/16 00:40:10 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -361,3 +361,26 @@ pktq_set_maxlen(pktqueue_t *pq, size_t m
kmem_free(qs, slotbytes);
return 0;
}
+
+int
+sysctl_pktq_maxlen(SYSCTLFN_ARGS, pktqueue_t *pq)
+{
+ u_int nmaxlen = pktq_get_count(pq, PKTQ_MAXLEN);
+ struct sysctlnode node = *rnode;
+ int error;
+
+ node.sysctl_data = &nmaxlen;
+ error = sysctl_lookup(SYSCTLFN_CALL(&node));
+ if (error || newp == NULL)
+ return error;
+ return pktq_set_maxlen(pq, nmaxlen);
+}
+
+int
+sysctl_pktq_count(SYSCTLFN_ARGS, pktqueue_t *pq, u_int count_id)
+{
+ int count = pktq_get_count(pq, count_id);
+ struct sysctlnode node = *rnode;
+ node.sysctl_data = &count;
+ return sysctl_lookup(SYSCTLFN_CALL(&node));
+}
Index: src/sys/net/pktqueue.h
diff -u src/sys/net/pktqueue.h:1.3 src/sys/net/pktqueue.h:1.4
--- src/sys/net/pktqueue.h:1.3 Mon Jun 16 00:33:39 2014
+++ src/sys/net/pktqueue.h Mon Jun 16 00:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pktqueue.h,v 1.3 2014/06/16 00:33:39 ozaki-r Exp $ */
+/* $NetBSD: pktqueue.h,v 1.4 2014/06/16 00:40:10 ozaki-r Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
#error "not supposed to be exposed to userland."
#endif
+#include <sys/sysctl.h>
+
struct mbuf;
typedef struct pktqueue pktqueue_t;
@@ -54,4 +56,7 @@ int pktq_set_maxlen(pktqueue_t *, size_
uint32_t pktq_rps_hash(const struct mbuf *);
uint64_t pktq_get_count(pktqueue_t *, pktq_count_t);
+int sysctl_pktq_maxlen(SYSCTLFN_PROTO, pktqueue_t *);
+int sysctl_pktq_count(SYSCTLFN_PROTO, pktqueue_t *, u_int);
+
#endif
