Fix LINT build.

I never get why LINT isn't just checked before pushing such huge
changes. Takes just a couple of minutes, really. :)

diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index 13cbf10..b0407a0 100644 (file)
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -2750,7 +2750,7 @@ pf_socket_lookup(int direction, struct pf_pdesc *pd)
        case AF_INET:
 #ifdef SMP
                if (msg != NULL) {
-                       lwkt_sendmsg(tcp_cport(pi_cpu),
+                       lwkt_sendmsg(cpu_portfn(pi_cpu),
                                     &msg->nm_netmsg.nm_lmsg);
                } else
 #endif /* SMP */

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 4018d48..c714e71 100644 (file)
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -52,6 +52,7 @@
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -223,7 +224,7 @@ div_soport(struct socket *so, struct sockaddr *nam, struct mbuf **mptr)
        ip_cpufn(mptr, 0, dir);
        m = *mptr;
        if (m) {
-               KKASSERT(m->m_flash & M_HASH);
+               KKASSERT(m->m_flags & M_HASH);
                return(cpu_portfn(m->m_pkthdr.hash));
        }
        return(NULL);

diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 750d112..14511d9 100644 (file)
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -53,6 +53,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/sysctl.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>

diff --git a/sys/netinet/sctp_peeloff.c b/sys/netinet/sctp_peeloff.c
index 63f053f..2a5d19f 100644 (file)
--- a/sys/netinet/sctp_peeloff.c
+++ b/sys/netinet/sctp_peeloff.c
@@ -56,6 +56,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <net/if.h>

diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 20fce83..3526f85 100644 (file)
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -60,6 +60,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/thread2.h>

diff --git a/sys/netproto/atalk/ddp_usrreq.c b/sys/netproto/atalk/ddp_usrreq.c
index 25646dd..f523a29 100644 (file)
--- a/sys/netproto/atalk/ddp_usrreq.c
+++ b/sys/netproto/atalk/ddp_usrreq.c
@@ -11,8 +11,10 @@
 #include <sys/priv.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/mplock2.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/protosw.h>
 #include <sys/thread2.h>
 #include <net/if.h>
@@ -123,7 +125,7 @@ ddp_disconnect(struct socket *so)
        at_pcbdisconnect( ddp );
        ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE;
        soisdisconnected( so );
-       sofree(sp);             /* soref above */
+       sofree(so);             /* soref above */
        return(0);
 }
 
@@ -189,7 +191,7 @@ ddp_abort(struct socket *so)
        int error;
        
        ddp = sotoddpcb(so);
-       if (ddb) {
+       if (ddp) {
                soisdisconnected( so );
                at_pcbdetach( so, ddp );
                error = 0;

diff --git a/sys/netproto/atm/atm_subr.c b/sys/netproto/atm/atm_subr.c
index fc20ab7..bc4e91f 100644 (file)
--- a/sys/netproto/atm/atm_subr.c
+++ b/sys/netproto/atm/atm_subr.c
@@ -37,6 +37,7 @@
 
 #include "kern_include.h"
 
+#include <sys/mplock2.h>
 #include <sys/thread2.h>
 #include <sys/msgport2.h>
 

diff --git a/sys/netproto/ipx/ipx_usrreq.c b/sys/netproto/ipx/ipx_usrreq.c
index 9aaee0e..ca5cc6b 100644 (file)
--- a/sys/netproto/ipx/ipx_usrreq.c
+++ b/sys/netproto/ipx/ipx_usrreq.c
@@ -48,6 +48,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/sysctl.h>
 #include <sys/thread2.h>
 

diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c
index 9eed8e4..a0b702b 100644 (file)
--- a/sys/netproto/ipx/spx_usrreq.c
+++ b/sys/netproto/ipx/spx_usrreq.c
@@ -46,6 +46,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/thread2.h>
 
 #include <net/route.h>

diff --git a/sys/netproto/mpls/mpls_demux.c b/sys/netproto/mpls/mpls_demux.c
index dc2b80c..3a3dddb 100644 (file)
--- a/sys/netproto/mpls/mpls_demux.c
+++ b/sys/netproto/mpls/mpls_demux.c
@@ -89,7 +89,6 @@ mpls_cpufn(struct mbuf **mp, int hoff)
        struct mpls *mpls;
        mpls_label_t label;
        struct ifnet *ifp;
-       lwkt_port_t port;
 
        mpls_lengthcheck(mp, hoff);
        if ((m = *mp) == NULL)

diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c
index f28a759..bb917d1 100644 (file)
--- a/sys/netproto/ncp/ncp_sock.c
+++ b/sys/netproto/ncp/ncp_sock.c
@@ -50,6 +50,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/socketops.h>
 #include <sys/kernel.h>
 #include <sys/uio.h>

diff --git a/sys/netproto/ns/idp_usrreq.c b/sys/netproto/ns/idp_usrreq.c
index 1432f0d..129ae2d 100644 (file)
--- a/sys/netproto/ns/idp_usrreq.c
+++ b/sys/netproto/ns/idp_usrreq.c
@@ -42,6 +42,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/thread2.h>

diff --git a/sys/netproto/ns/spp_usrreq.c b/sys/netproto/ns/spp_usrreq.c
index b748a42..73edb07 100644 (file)
--- a/sys/netproto/ns/spp_usrreq.c
+++ b/sys/netproto/ns/spp_usrreq.c
@@ -43,6 +43,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/errno.h>
 #include <sys/thread2.h>
 

diff --git a/sys/netproto/smb/smb_trantcp.c b/sys/netproto/smb/smb_trantcp.c
index 25086b9..3b2bb62 100644 (file)
--- a/sys/netproto/smb/smb_trantcp.c
+++ b/sys/netproto/smb/smb_trantcp.c
@@ -42,6 +42,7 @@
 #include <sys/resourcevar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/socketvar2.h>
 #include <sys/socketops.h>
 #include <sys/poll.h>
 #include <sys/uio.h>