NETGRAPH7: Fix kernel build with options NETGRAPH7.
authorNuno Antunes <nuno.antunes@gmail.com>
Fri, 3 Sep 2010 20:30:04 +0000 (21:30 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:27 +0000 (14:10 +0000)
* Pass flags to tsleep_interlock.
* Silence gcc warning being treated as error.
* Remove socket polling.

sys/netgraph7/dragonfly.c
sys/netgraph7/iface/ng_iface.c
sys/netgraph7/socket/ng_socket.c

index 7f3e1d6..098af05 100644 (file)
@@ -104,7 +104,7 @@ lock_sleep(void *ident, int flags, const char *wmesg, int timo,
        KKASSERT((mode == LK_EXCLUSIVE) || (mode == LK_SHARED));
 
        crit_enter();
-       tsleep_interlock(ident);
+       tsleep_interlock(ident, flags);
        lockmgr(lk, LK_RELEASE);
        err = tsleep(ident, flags, wmesg, timo);
        crit_exit();
index d6d7d21..e182fe7 100644 (file)
@@ -457,7 +457,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m,
 static void
 ng_iface_start(struct ifnet *ifp)
 {
-       struct mbuf *m;
+       struct mbuf *m = NULL;
        sa_family_t sa;
 
        KASSERT(ifq_is_enabled(&ifp->if_snd), ("%s without ALTQ", __func__));
index d8b4527..1ee8cce 100644 (file)
@@ -1063,7 +1063,6 @@ static struct pr_usrreqs ngc_usrreqs = {
        .pru_send =             ngc_send,
        .pru_shutdown =         NULL,
        .pru_sockaddr =         ng_getsockaddr,
-       .pru_sopoll =           sopoll,
        .pru_sosend =           sosend,
        .pru_soreceive =        soreceive,
        /* .pru_close =         NULL, */
@@ -1080,7 +1079,6 @@ static struct pr_usrreqs ngd_usrreqs = {
        .pru_send =             ngd_send,
        .pru_shutdown =         NULL,
        .pru_sockaddr =         ng_getsockaddr,
-       .pru_sopoll =           sopoll,
        .pru_sosend =           sosend,
        .pru_soreceive =        soreceive,
        /* .pru_close =         NULL, */