NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kern/46706: Move macro into _KERNEL block.



>Number:         46706
>Category:       kern
>Synopsis:       Move macro into _KERNEL block.
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 15 13:10:00 +0000 2012
>Originator:     Henning Petersen
>Release:        NetBSD-current
>Organization:
>Environment:
>Description:
Move macro into _KERNEL block, is only used in kernel.
>How-To-Repeat:

>Fix:
diff -u -p -r1.129 socketvar.h
--- sys/sys/socketvar.h 1 Feb 2012 02:27:23 -0000       1.129
+++ sys/sys/socketvar.h 14 Jul 2012 02:46:01 -0000
@@ -180,15 +180,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.
  */
@@ -234,6 +225,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;



Home | Main Index | Thread Index | Old Index