Module Name: src
Committed By: pgoyette
Date: Wed Jun 1 04:15:54 UTC 2016
Modified Files:
src/sys/sys: socketvar.h
Log Message:
Move macro inside of #ifdef KERNEL
PR kern/46706
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/sys/socketvar.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/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.139 src/sys/sys/socketvar.h:1.140
--- src/sys/sys/socketvar.h:1.139 Sat May 9 15:22:47 2015
+++ src/sys/sys/socketvar.h Wed Jun 1 04:15:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.139 2015/05/09 15:22:47 rtr Exp $ */
+/* $NetBSD: socketvar.h,v 1.140 2016/06/01 04:15:54 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -184,15 +184,6 @@ struct socket {
kauth_cred_t so_cred; /* socket credentials */
};
-#define SB_EMPTY_FIXUP(sb) \
-do { \
- KASSERT(solocked((sb)->sb_so)); \
- if ((sb)->sb_mb == NULL) { \
- (sb)->sb_mbtail = NULL; \
- (sb)->sb_lastrecord = NULL; \
- } \
-} while (/*CONSTCOND*/0)
-
/*
* Socket state bits.
*/
@@ -237,6 +228,15 @@ struct sockopt {
uint8_t sopt_buf[sizeof(int)]; /* internal storage */
};
+#define SB_EMPTY_FIXUP(sb) \
+do { \
+ KASSERT(solocked((sb)->sb_so)); \
+ if ((sb)->sb_mb == NULL) { \
+ (sb)->sb_mbtail = NULL; \
+ (sb)->sb_lastrecord = NULL; \
+ } \
+} while (/*CONSTCOND*/0)
+
extern u_long sb_max;
extern int somaxkva;
extern int sock_loan_thresh;
