Date: Thu, 27 Nov 2008 13:50:47 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153669 for review Message-ID: <200811271350.mARDol7j032122@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153669 Change 153669 by zec@zec_tca51 on 2008/11/27 13:50:35 Unbreak LINT and VLINT builds. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_poll.c#14 edit .. //depot/projects/vimage/src/sys/net/bpf.c#30 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#22 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#14 (text+ko) ==== @@ -37,6 +37,7 @@ #include <sys/sockio.h> #include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/vimage.h> #include <net/if.h> /* for IFF_* flags */ #include <net/netisr.h> /* for NETISR_POLL */ @@ -44,7 +45,6 @@ #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/kthread.h> -#include <sys/vimage.h> static void netisr_poll(void); /* the two netisr handlers */ static void netisr_pollmore(void); ==== //depot/projects/vimage/src/sys/net/bpf.c#30 (text+ko) ==== @@ -873,21 +873,18 @@ m->m_len -= hlen; m->m_data += hlen; /* XXX */ + CURVNET_SET(ifp->if_vnet); #ifdef MAC BPFD_LOCK(d); - CURVNET_SET(ifp->if_vnet); mac_bpfdesc_create_mbuf(d, m); - CURVNET_RESTORE(); if (mc != NULL) mac_bpfdesc_create_mbuf(d, mc); BPFD_UNLOCK(d); #endif - CURVNET_SET(ifp->if_vnet); error = (*ifp->if_output)(ifp, m, &dst, NULL); if (error) d->bd_wdcount++; - CURVNET_RESTORE(); if (mc != NULL) { if (error == 0) @@ -895,6 +892,7 @@ else m_freem(mc); } + CURVNET_RESTORE(); return (error); } ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#22 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netipsec/keysock.h#4 (text+ko) ==== @@ -58,12 +58,10 @@ u_quad_t sockerr; /* # of socket related errors */ }; -#ifdef VIMAGE struct key_cb { int key_count; int any_count; }; -#endif #define KEY_SENDUP_ONE 0 #define KEY_SENDUP_ALL 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811271350.mARDol7j032122>