purge COUNT stuff now that we can use gprof

SCCS-vsn: sys/net/if.c 4.17
SCCS-vsn: sys/vax/if/if_acc.c 4.19
SCCS-vsn: sys/vax/if/if_dmc.c 4.17
SCCS-vsn: sys/vax/if/if_ec.c 4.19
SCCS-vsn: sys/vax/if/if_en.c 4.67
SCCS-vsn: sys/vax/if/if_il.c 4.8
SCCS-vsn: sys/deprecated/netimp/if_imp.c 4.37
SCCS-vsn: sys/deprecated/netimp/if_imphost.c 4.13
SCCS-vsn: sys/net/if_loop.c 4.13
SCCS-vsn: sys/vax/if/if_uba.c 4.12
SCCS-vsn: sys/vax/if/if_vv.c 4.5
SCCS-vsn: sys/netinet/in.c 4.3
SCCS-vsn: sys/vax/vax/in_cksum.c 1.12
SCCS-vsn: sys/netinet/in_pcb.c 4.28
SCCS-vsn: sys/netinet/in_systm.h 4.12
SCCS-vsn: sys/netinet/ip_icmp.c 4.17
SCCS-vsn: sys/netinet/ip_input.c 1.45
SCCS-vsn: sys/netinet/ip_output.c 1.35
SCCS-vsn: sys/deprecated/netpup/pup.c 4.2
SCCS-vsn: sys/net/raw_cb.c 4.9
SCCS-vsn: sys/deprecated/netimp/raw_imp.c 4.12
SCCS-vsn: sys/netinet/raw_ip.c 4.13
SCCS-vsn: sys/deprecated/netpup/raw_pup.c 4.12
SCCS-vsn: sys/net/raw_usrreq.c 4.17
SCCS-vsn: sys/net/route.c 4.11
SCCS-vsn: sys/netinet/tcp_input.c 1.68
SCCS-vsn: sys/netinet/tcp_output.c 4.42
SCCS-vsn: sys/netinet/tcp_subr.c 4.27
SCCS-vsn: sys/netinet/tcp_timer.c 4.23
SCCS-vsn: sys/netinet/tcp_usrreq.c 1.59
SCCS-vsn: sys/netinet/udp_usrreq.c 4.30

diff --git a/usr/src/sys/deprecated/netimp/if_imp.c b/usr/src/sys/deprecated/netimp/if_imp.c
index 2338e08..261c989 100644 (file)
--- a/usr/src/sys/deprecated/netimp/if_imp.c
+++ b/usr/src/sys/deprecated/netimp/if_imp.c
@@ -1,4 +1,4 @@
-/*     if_imp.c        4.36    82/06/15        */
+/*     if_imp.c        4.37    82/06/20        */

 
 #include "imp.h"
 #if NIMP > 0
 
 #include "imp.h"
 #if NIMP > 0


@@ -80,7 +80,6 @@ impattach(ui)
        register struct ifnet *ifp = &sc->imp_if;
        struct sockaddr_in *sin;
 
        register struct ifnet *ifp = &sc->imp_if;
        struct sockaddr_in *sin;
 

-COUNT(IMPATTACH);

        /* UNIT COULD BE AMBIGUOUS */
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "imp";
        /* UNIT COULD BE AMBIGUOUS */
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "imp";


@@ -108,7 +107,6 @@ impinit(unit)
        int s = splimp();
        register struct imp_softc *sc = &imp_softc[unit];
 
        int s = splimp();
        register struct imp_softc *sc = &imp_softc[unit];
 

-COUNT(IMPINIT);

        if ((*sc->imp_cb.ic_init)(unit) == 0) {
                sc->imp_state = IMPS_DOWN;
                sc->imp_if.if_flags &= ~IFF_UP;
        if ((*sc->imp_cb.ic_init)(unit) == 0) {
                sc->imp_state = IMPS_DOWN;
                sc->imp_if.if_flags &= ~IFF_UP;


@@ -147,7 +145,6 @@ impinput(unit, m)
        struct mbuf *next;
        struct sockaddr_in *sin;
 
        struct mbuf *next;
        struct sockaddr_in *sin;
 

-COUNT(IMPINPUT);

        /* verify leader length. */
        if (m->m_len < sizeof(struct control_leader) &&
            (m = m_pullup(m, sizeof(struct control_leader))) == 0)
        /* verify leader length. */
        if (m->m_len < sizeof(struct control_leader) &&
            (m = m_pullup(m, sizeof(struct control_leader))) == 0)


@@ -346,7 +343,6 @@ impdown(sc)
        struct imp_softc *sc;
 {
 
        struct imp_softc *sc;
 {
 

-COUNT(IMPDOWN);

        sc->imp_state = IMPS_DOWN;
        impmsg(sc, "marked down");
        hostreset(sc->imp_if.if_net);
        sc->imp_state = IMPS_DOWN;
        impmsg(sc, "marked down");
        hostreset(sc->imp_if.if_net);


@@ -360,7 +356,6 @@ impmsg(sc, fmt, a1, a2)
        u_int a1;
 {
 
        u_int a1;
 {
 

-COUNT(IMPMSG);

        printf("imp%d: ", sc->imp_if.if_unit);
        printf(fmt, a1, a2);
        printf("\n");
        printf("imp%d: ", sc->imp_if.if_unit);
        printf(fmt, a1, a2);
        printf("\n");


@@ -377,7 +372,6 @@ impnotify(what, cp, hp)
 {
        struct in_addr in;
 
 {
        struct in_addr in;
 

-COUNT(IMPNOTIFY);

 #ifdef notdef
        in.s_net = cp->dl_network;
 #else
 #ifdef notdef
        in.s_net = cp->dl_network;
 #else


@@ -411,7 +405,6 @@ impoutput(ifp, m0, dst)
        int x, dhost, dimp, dlink, len, dnet;
        int error = 0;
 
        int x, dhost, dimp, dlink, len, dnet;
        int error = 0;
 

-COUNT(IMPOUTPUT);

        /*
         * Don't even try if the IMP is unavailable.
         */
        /*
         * Don't even try if the IMP is unavailable.
         */


@@ -496,7 +489,6 @@ impsnd(ifp, m)
        struct impcb *icp;
        int s, error;
 
        struct impcb *icp;
        int s, error;
 

-COUNT(IMPSND);

        ip = mtod(m, struct imp_leader *);
 
        /*
        ip = mtod(m, struct imp_leader *);
 
        /*


@@ -573,7 +565,6 @@ impnoops(sc)
        register struct control_leader *cp;
        int x;
 
        register struct control_leader *cp;
        int x;
 

-COUNT(IMPNOOPS);

        sc->imp_dropcnt = IMP_DROPCNT;
        for (i = 0; i < IMP_DROPCNT + 1; i++ ) { 
                if ((m = m_getclr(M_DONTWAIT)) == 0) 
        sc->imp_dropcnt = IMP_DROPCNT;
        for (i = 0; i < IMP_DROPCNT + 1; i++ ) { 
                if ((m = m_getclr(M_DONTWAIT)) == 0) 

diff --git a/usr/src/sys/deprecated/netimp/if_imphost.c b/usr/src/sys/deprecated/netimp/if_imphost.c
index c5c7861..9388b53 100644 (file)
--- a/usr/src/sys/deprecated/netimp/if_imphost.c
+++ b/usr/src/sys/deprecated/netimp/if_imphost.c
@@ -1,4 +1,4 @@
-/*     if_imphost.c    4.12    82/05/11        */
+/*     if_imphost.c    4.13    82/06/20        */

 
 #include "imp.h"
 #if NIMP > 0
 
 #include "imp.h"
 #if NIMP > 0


@@ -32,7 +32,6 @@ hostlookup(addr)
        register int hash = HOSTHASH(addr);
        int s = splnet();
 
        register int hash = HOSTHASH(addr);
        int s = splnet();
 

-COUNT(HOSTLOOKUP);

        for (m = hosts; m; m = m->m_next) {
                hp = &mtod(m, struct hmbuf *)->hm_hosts[hash];
                if (hp->h_addr.s_addr == addr.s_addr) {
        for (m = hosts; m; m = m->m_next) {
                hp = &mtod(m, struct hmbuf *)->hm_hosts[hash];
                if (hp->h_addr.s_addr == addr.s_addr) {


@@ -60,7 +59,6 @@ hostenter(addr)
        register int hash = HOSTHASH(addr);
        int s = splnet();
 
        register int hash = HOSTHASH(addr);
        int s = splnet();
 

-COUNT(HOSTENTER);

        mprev = &hosts;
        while (m = *mprev) {
                mprev = &m->m_next;
        mprev = &hosts;
        while (m = *mprev) {
                mprev = &m->m_next;


@@ -112,7 +110,6 @@ hostfree(hp)
 {
        int s = splnet();
 
 {
        int s = splnet();
 

-COUNT(HOSTFREE);

        hp->h_flags &= ~HF_INUSE;
        hp->h_timer = HOSTTIMER;
        hp->h_rfnm = 0;
        hp->h_flags &= ~HF_INUSE;
        hp->h_timer = HOSTTIMER;
        hp->h_rfnm = 0;


@@ -130,7 +127,6 @@ hostreset(net)
        struct hmbuf *hm;
        int s = splnet();
 
        struct hmbuf *hm;
        int s = splnet();
 

-COUNT(HOSTRESET);

        for (m = hosts; m; m = m->m_next) {
                hm = mtod(m, struct hmbuf *);
                hp = hm->hm_hosts; 
        for (m = hosts; m; m = m->m_next) {
                hm = mtod(m, struct hmbuf *);
                hp = hm->hm_hosts; 


@@ -156,7 +152,6 @@ hostrelease(hp)
 {
        register struct mbuf *m, **mprev, *mh = dtom(hp);
 
 {
        register struct mbuf *m, **mprev, *mh = dtom(hp);
 

-COUNT(HOSTRELEASE);

        /*
         * Discard any packets left on the waiting q
         */
        /*
         * Discard any packets left on the waiting q
         */


@@ -212,7 +207,6 @@ hostslowtimo()
        struct hmbuf *hm;
        int s = splnet();
 
        struct hmbuf *hm;
        int s = splnet();
 

-COUNT(HOSTSLOWTIMO);

        for (m = hosts; m; m = m->m_next) {
                hm = mtod(m, struct hmbuf *);
                hp = hm->hm_hosts; 
        for (m = hosts; m; m = m->m_next) {
                hm = mtod(m, struct hmbuf *);
                hp = hm->hm_hosts; 

diff --git a/usr/src/sys/deprecated/netimp/raw_imp.c b/usr/src/sys/deprecated/netimp/raw_imp.c
index 03f78b9..fae6ccc 100644 (file)
--- a/usr/src/sys/deprecated/netimp/raw_imp.c
+++ b/usr/src/sys/deprecated/netimp/raw_imp.c
@@ -1,4 +1,4 @@
-/*     raw_imp.c       4.11    82/04/11        */
+/*     raw_imp.c       4.12    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -35,7 +35,6 @@ rimp_output(m, so)
        struct ifnet *ifp;
        struct control_leader *cp;
 
        struct ifnet *ifp;
        struct control_leader *cp;
 

-COUNT(RIMP_OUTPUT);

        /*
         * Verify user has supplied necessary space
         * for the leader and check parameters in it.
        /*
         * Verify user has supplied necessary space
         * for the leader and check parameters in it.

diff --git a/usr/src/sys/deprecated/netpup/pup.c b/usr/src/sys/deprecated/netpup/pup.c
index 803f061..df6a1a1 100644 (file)
--- a/usr/src/sys/deprecated/netpup/pup.c
+++ b/usr/src/sys/deprecated/netpup/pup.c
@@ -1,4 +1,4 @@
-/*     pup.c   4.1     82/06/13        */
+/*     pup.c   4.2     82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -15,7 +15,6 @@ pup_hash(spup, hp)
        struct sockaddr_pup *spup;
        struct afhash *hp;
 {
        struct sockaddr_pup *spup;
        struct afhash *hp;
 {

-COUNT(PUP_HASH);

        hp->afh_nethash = spup->spup_addr.pp_net;
        hp->afh_hosthash = spup->spup_addr.pp_host;
        if (hp->afh_hosthash < 0)
        hp->afh_nethash = spup->spup_addr.pp_net;
        hp->afh_hosthash = spup->spup_addr.pp_host;
        if (hp->afh_hosthash < 0)


@@ -25,7 +24,6 @@ COUNT(PUP_HASH);
 pup_netmatch(spup1, spup2)
        struct sockaddr_pup *spup1, *spup2;
 {
 pup_netmatch(spup1, spup2)
        struct sockaddr_pup *spup1, *spup2;
 {

-COUNT(PUP_NETMATCH);

        return (spup1->spup_addr.pp_net == spup2->spup_addr.pp_net);
 }
 #endif
        return (spup1->spup_addr.pp_net == spup2->spup_addr.pp_net);
 }
 #endif

diff --git a/usr/src/sys/deprecated/netpup/raw_pup.c b/usr/src/sys/deprecated/netpup/raw_pup.c
index b74e47d..1150413 100644 (file)
--- a/usr/src/sys/deprecated/netpup/raw_pup.c
+++ b/usr/src/sys/deprecated/netpup/raw_pup.c
@@ -1,4 +1,4 @@
-/*     raw_pup.c       4.11    82/04/10        */
+/*     raw_pup.c       4.12    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -31,7 +31,6 @@ rpup_output(m, so)
        struct sockaddr_pup *dst;
        struct ifnet *ifp;
 
        struct sockaddr_pup *dst;
        struct ifnet *ifp;
 

-COUNT(RPUP_OUTPUT);

        /*
         * Verify user has supplied necessary space
         * for the header and check parameters in it.
        /*
         * Verify user has supplied necessary space
         * for the header and check parameters in it.

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index 7915b25..0fcf3c8 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,4 +1,4 @@
-/*     if.c    4.16    82/06/13        */
+/*     if.c    4.17    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -53,7 +53,6 @@ if_attach(ifp)
 {
        register struct ifnet **p = &ifnet;
 
 {
        register struct ifnet **p = &ifnet;
 

-COUNT(IF_ATTACH);

        while (*p)
                p = &((*p)->if_next);
        *p = ifp;
        while (*p)
                p = &((*p)->if_next);
        *p = ifp;


@@ -69,7 +68,6 @@ if_ifwithaddr(addr)
 {
        register struct ifnet *ifp;
 
 {
        register struct ifnet *ifp;
 

-COUNT(IF_IFWITHADDR);

 #define        equal(a1, a2) \
        (bcmp((caddr_t)((a1)->sa_data), (caddr_t)((a2)->sa_data), 14) == 0)
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
 #define        equal(a1, a2) \
        (bcmp((caddr_t)((a1)->sa_data), (caddr_t)((a2)->sa_data), 14) == 0)
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {

diff --git a/usr/src/sys/net/if_loop.c b/usr/src/sys/net/if_loop.c
index 4d1fc70..c2a4236 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*     if_loop.c       4.12    82/06/12        */
+/*     if_loop.c       4.13    82/06/20        */

 
 /*
  * Loopback interface driver for protocol testing and timing.
 
 /*
  * Loopback interface driver for protocol testing and timing.


@@ -28,7 +28,6 @@ loattach()
        register struct ifnet *ifp = &loif;
        register struct sockaddr_in *sin;
 
        register struct ifnet *ifp = &loif;
        register struct sockaddr_in *sin;
 

-COUNT(LOATTACH);

        ifp->if_name = "lo";
        ifp->if_mtu = LOMTU;
        ifp->if_net = LONET;
        ifp->if_name = "lo";
        ifp->if_mtu = LOMTU;
        ifp->if_net = LONET;


@@ -49,7 +48,6 @@ looutput(ifp, m0, dst)
        int s = splimp();
        register struct ifqueue *ifq;
 
        int s = splimp();
        register struct ifqueue *ifq;
 

-COUNT(LOOUTPUT);

        ifp->if_opackets++;
        switch (dst->sa_family) {
 
        ifp->if_opackets++;
        switch (dst->sa_family) {
 

diff --git a/usr/src/sys/net/raw_cb.c b/usr/src/sys/net/raw_cb.c
index 76e8563..943edee 100644 (file)
--- a/usr/src/sys/net/raw_cb.c
+++ b/usr/src/sys/net/raw_cb.c
@@ -1,4 +1,4 @@
-/*     raw_cb.c        4.8     82/04/11        */
+/*     raw_cb.c        4.9     82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -33,7 +33,6 @@ raw_attach(so, addr)
        struct mbuf *m;
        register struct rawcb *rp;
 
        struct mbuf *m;
        register struct rawcb *rp;
 

-COUNT(RAW_ATTACH);

        if (ifnet == 0)
                return (EADDRNOTAVAIL);
        /*
        if (ifnet == 0)
                return (EADDRNOTAVAIL);
        /*


@@ -108,7 +107,6 @@ raw_detach(rp)
 {
        struct socket *so = rp->rcb_socket;
 
 {
        struct socket *so = rp->rcb_socket;
 

-COUNT(RAW_DETACH);

        so->so_pcb = 0;
        sofree(so);
        remque(rp);
        so->so_pcb = 0;
        sofree(so);
        remque(rp);


@@ -121,7 +119,6 @@ COUNT(RAW_DETACH);
 raw_disconnect(rp)
        struct rawcb *rp;
 {
 raw_disconnect(rp)
        struct rawcb *rp;
 {

-COUNT(RAW_DISCONNECT);

        rp->rcb_flags &= ~RAW_FADDR;
        if (rp->rcb_socket->so_state & SS_USERGONE)
                raw_detach(rp);
        rp->rcb_flags &= ~RAW_FADDR;
        if (rp->rcb_socket->so_state & SS_USERGONE)
                raw_detach(rp);


@@ -135,7 +132,6 @@ raw_connaddr(rp, addr)
        struct rawcb *rp;
        struct sockaddr *addr;
 {
        struct rawcb *rp;
        struct sockaddr *addr;
 {

-COUNT(RAW_CONNADDR);

        bcopy((caddr_t)addr, (caddr_t)&rp->rcb_faddr, sizeof(*addr));
        rp->rcb_flags |= RAW_FADDR;
 }
        bcopy((caddr_t)addr, (caddr_t)&rp->rcb_faddr, sizeof(*addr));
        rp->rcb_flags |= RAW_FADDR;
 }

diff --git a/usr/src/sys/net/raw_usrreq.c b/usr/src/sys/net/raw_usrreq.c
index 0beebd3..3c83a9d 100644 (file)
--- a/usr/src/sys/net/raw_usrreq.c
+++ b/usr/src/sys/net/raw_usrreq.c
@@ -1,4 +1,4 @@
-/*     raw_usrreq.c    4.16    82/04/25        */
+/*     raw_usrreq.c    4.17    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -20,7 +20,6 @@ int   rawqmaxlen = IFQ_MAXLEN;
 raw_init()
 {
 
 raw_init()
 {
 

-COUNT(RAW_INIT);

        rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }
        rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }


@@ -37,7 +36,6 @@ raw_input(m0, proto, src, dst)
        struct raw_header *rh;
        int s;
 
        struct raw_header *rh;
        int s;
 

-COUNT(RAW_INPUT);

        /*
         * Rip off an mbuf for a generic header.
         */
        /*
         * Rip off an mbuf for a generic header.
         */


@@ -84,7 +82,6 @@ rawintr()
        register struct raw_header *rh;
        struct socket *last;
 
        register struct raw_header *rh;
        struct socket *last;
 

-COUNT(RAWINTR);

 next:
        s = splimp();
        IF_DEQUEUE(&rawintrq, m);
 next:
        s = splimp();
        IF_DEQUEUE(&rawintrq, m);


@@ -143,7 +140,6 @@ raw_ctlinput(cmd, arg)
        int cmd;
        caddr_t arg;
 {
        int cmd;
        caddr_t arg;
 {

-COUNT(RAW_CTLINPUT);

 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;


@@ -159,7 +155,6 @@ raw_usrreq(so, req, m, addr)
        register struct rawcb *rp = sotorawcb(so);
        int error = 0;
 
        register struct rawcb *rp = sotorawcb(so);
        int error = 0;
 

-COUNT(RAW_USRREQ);

        if (rp == 0 && req != PRU_ATTACH)
                return (EINVAL);
 
        if (rp == 0 && req != PRU_ATTACH)
                return (EINVAL);
 

diff --git a/usr/src/sys/net/route.c b/usr/src/sys/net/route.c
index 3c0d1b8..ea73e40 100644 (file)
--- a/usr/src/sys/net/route.c
+++ b/usr/src/sys/net/route.c
@@ -1,4 +1,4 @@
-/*     route.c 4.10    82/06/12        */
+/*     route.c 4.11    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -27,7 +27,6 @@ rtalloc(ro)
        struct sockaddr *dst = &ro->ro_dst;
        int af = dst->sa_family;
 
        struct sockaddr *dst = &ro->ro_dst;
        int af = dst->sa_family;
 

-COUNT(RTALLOC);

        if (ro->ro_rt && ro->ro_rt->rt_ifp)                     /* XXX */
                return;
        if (af >= AF_MAX)
        if (ro->ro_rt && ro->ro_rt->rt_ifp)                     /* XXX */
                return;
        if (af >= AF_MAX)


@@ -98,7 +97,6 @@ rtrequest(req, entry)
        int af, s, error = 0, hash, (*match)();
        struct ifnet *ifp;
 
        int af, s, error = 0, hash, (*match)();
        struct ifnet *ifp;
 

-COUNT(RTREQUEST);

        af = entry->rt_dst.sa_family;
        if (af >= AF_MAX)
                return (EAFNOSUPPORT);
        af = entry->rt_dst.sa_family;
        if (af >= AF_MAX)
                return (EAFNOSUPPORT);

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index cf65f69..89858fd 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*     in.c    4.2     82/06/13        */
+/*     in.c    4.3     82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -16,7 +16,6 @@ inet_hash(sin, hp)
        register struct sockaddr_in *sin;
        struct afhash *hp;
 {
        register struct sockaddr_in *sin;
        struct afhash *hp;
 {

-COUNT(INET_HASH);

        hp->afh_nethash = in_netof(sin->sin_addr);
        hp->afh_hosthash = ntohl(sin->sin_addr.s_addr);
        if (hp->afh_hosthash < 0)
        hp->afh_nethash = in_netof(sin->sin_addr);
        hp->afh_hosthash = ntohl(sin->sin_addr.s_addr);
        if (hp->afh_hosthash < 0)


@@ -26,7 +25,6 @@ COUNT(INET_HASH);
 inet_netmatch(sin1, sin2)
        struct sockaddr_in *sin1, *sin2;
 {
 inet_netmatch(sin1, sin2)
        struct sockaddr_in *sin1, *sin2;
 {

-COUNT(INET_NETMATCH);

        return (sin1->sin_addr.s_net == sin2->sin_addr.s_net);
 }
 
        return (sin1->sin_addr.s_net == sin2->sin_addr.s_net);
 }
 


@@ -40,7 +38,6 @@ if_makeaddr(net, host)
 {
        u_long addr;
 
 {
        u_long addr;
 

-COUNT(IF_MAKEADDR);

        if (net < 128)
                addr = (net << 24) | host;
        else if (net < 65536)
        if (net < 128)
                addr = (net << 24) | host;
        else if (net < 65536)


@@ -87,7 +84,6 @@ if_rtinit(ifp, flags)
 {
        struct sockaddr_in sin;
 
 {
        struct sockaddr_in sin;
 

-COUNT(IF_RTINIT);

        if (ifp->if_flags & IFF_ROUTE)
                return;
        bzero((caddr_t)&sin, sizeof (sin));
        if (ifp->if_flags & IFF_ROUTE)
                return;
        bzero((caddr_t)&sin, sizeof (sin));

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index 1caf0fe..6ba0ab2 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*     in_pcb.c        4.27    82/06/13        */
+/*     in_pcb.c        4.28    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -63,7 +63,6 @@ in_pcbattach(so, head, sndcc, rcvcc, sin)
        register struct inpcb *inp;
        u_short lport = 0;
 
        register struct inpcb *inp;
        u_short lport = 0;
 

-COUNT(IN_PCBATTACH);

        if (ifnet == 0)
                return (EADDRNOTAVAIL);
        if (sin) {
        if (ifnet == 0)
                return (EADDRNOTAVAIL);
        if (sin) {


@@ -138,7 +137,6 @@ in_pcbconnect(inp, sin)
        struct ifnet *ifp;
        struct sockaddr_in *ifaddr;
 
        struct ifnet *ifp;
        struct sockaddr_in *ifaddr;
 

-COUNT(IN_PCBCONNECT);

        if (sin->sin_family != AF_INET)
                return (EAFNOSUPPORT);
        if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0)
        if (sin->sin_family != AF_INET)
                return (EAFNOSUPPORT);
        if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0)


@@ -176,7 +174,6 @@ in_pcbdisconnect(inp)
        struct inpcb *inp;
 {
 
        struct inpcb *inp;
 {
 

-COUNT(IN_PCBDISCONNECT);

        inp->inp_faddr.s_addr = 0;
        inp->inp_fport = 0;
        if (inp->inp_socket->so_state & SS_USERGONE)
        inp->inp_faddr.s_addr = 0;
        inp->inp_fport = 0;
        if (inp->inp_socket->so_state & SS_USERGONE)


@@ -188,7 +185,6 @@ in_pcbdetach(inp)
 {
        struct socket *so = inp->inp_socket;
 
 {
        struct socket *so = inp->inp_socket;
 

-COUNT(IN_PCBDETACH);

        so->so_pcb = 0;
        sofree(so);
        if (inp->inp_route.ro_rt)
        so->so_pcb = 0;
        sofree(so);
        if (inp->inp_route.ro_rt)


@@ -201,7 +197,6 @@ in_setsockaddr(sin, inp)
        register struct sockaddr_in *sin;
        register struct inpcb *inp;
 {
        register struct sockaddr_in *sin;
        register struct inpcb *inp;
 {

-COUNT(IN_SETSOCKADDR);

        if (sin == 0 || inp == 0)
                panic("setsockaddr_in");
        bzero((caddr_t)sin, sizeof (*sin));
        if (sin == 0 || inp == 0)
                panic("setsockaddr_in");
        bzero((caddr_t)sin, sizeof (*sin));


@@ -224,7 +219,6 @@ in_pcbnotify(head, dst, errno, abort)
        register struct inpcb *inp, *oinp;
        int s = splimp();
 
        register struct inpcb *inp, *oinp;
        int s = splimp();
 

-COUNT(INP_PCBNOTIFY);

        for (inp = head->inp_next; inp != head;) {
                if (inp->inp_faddr.s_addr != dst->s_addr) {
        next:
        for (inp = head->inp_next; inp != head;) {
                if (inp->inp_faddr.s_addr != dst->s_addr) {
        next:

diff --git a/usr/src/sys/netinet/in_systm.h b/usr/src/sys/netinet/in_systm.h
index 6dbc721..6729024 100644 (file)
--- a/usr/src/sys/netinet/in_systm.h
+++ b/usr/src/sys/netinet/in_systm.h
@@ -1,4 +1,4 @@
-/*     in_systm.h      4.11    82/05/31        */
+/*     in_systm.h      4.12    82/06/20        */

 
 /*
  * Miscellaneous internetwork
 
 /*
  * Miscellaneous internetwork


@@ -54,18 +54,6 @@ typedef      u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 #ifndef LOCORE
 #ifdef KERNEL
 int    netisr;                         /* scheduling bits for network */
 #ifndef LOCORE
 #ifdef KERNEL
 int    netisr;                         /* scheduling bits for network */

-#endif
-
-
-#ifdef KERNEL

 n_time iptime();
 #endif
 n_time iptime();
 #endif

-
-#ifdef KPROF
-#include "../inet/count.h"
-#define        COUNT(i)        nrcount[i]++
-int    nrcount[NCOUNTERS+1];
-#else
-#define        COUNT(i)
-#endif

 #endif
 #endif

diff --git a/usr/src/sys/netinet/ip_icmp.c b/usr/src/sys/netinet/ip_icmp.c
index 31ba822..8fd3f44 100644 (file)
--- a/usr/src/sys/netinet/ip_icmp.c
+++ b/usr/src/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*     ip_icmp.c       4.16    82/05/02        */
+/*     ip_icmp.c       4.17    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -30,7 +30,6 @@ icmp_error(oip, type, code)
        register struct icmp *icp;
        struct mbuf *m;
        struct ip *nip;
        register struct icmp *icp;
        struct mbuf *m;
        struct ip *nip;

-COUNT(ICMP_ERROR);

 
        if (icmpprintfs)
                printf("icmp_error(%x, %d, %d)\n", oip, type, code);
 
        if (icmpprintfs)
                printf("icmp_error(%x, %d, %d)\n", oip, type, code);


@@ -106,7 +105,6 @@ icmp_input(m)
        register struct ip *ip = mtod(m, struct ip *);
        int icmplen = ip->ip_len, hlen = ip->ip_hl << 2, i, (*ctlfunc)();
        extern u_char ip_protox[];
        register struct ip *ip = mtod(m, struct ip *);
        int icmplen = ip->ip_len, hlen = ip->ip_hl << 2, i, (*ctlfunc)();
        extern u_char ip_protox[];

-COUNT(ICMP_INPUT);

 
        /*
         * Locate icmp structure in mbuf, and check
 
        /*
         * Locate icmp structure in mbuf, and check


@@ -199,7 +197,6 @@ icmp_reflect(ip)
        struct ip *ip;
 {
        struct in_addr t;
        struct ip *ip;
 {
        struct in_addr t;

-COUNT(ICMP_REFLECT);

 
        t = ip->ip_dst;
        ip->ip_dst = ip->ip_src;
 
        t = ip->ip_dst;
        ip->ip_dst = ip->ip_src;


@@ -220,7 +217,6 @@ icmp_send(ip)
        register struct icmp *icp;
        register struct mbuf *m = dtom(ip);
 
        register struct icmp *icp;
        register struct mbuf *m = dtom(ip);
 

-COUNT(ICMP_SEND);

        if (!generateicmpmsgs)
                return;
        icp = mtod(m, struct icmp *);
        if (!generateicmpmsgs)
                return;
        icp = mtod(m, struct icmp *);


@@ -239,7 +235,6 @@ iptime()
        int s = spl6();
        u_long t;
 
        int s = spl6();
        u_long t;
 

-COUNT(IPTIME);

        t = (time % SECDAY) * 1000 + lbolt * hz;
        splx(s);
        return (htonl(t));
        t = (time % SECDAY) * 1000 + lbolt * hz;
        splx(s);
        return (htonl(t));

diff --git a/usr/src/sys/netinet/ip_input.c b/usr/src/sys/netinet/ip_input.c
index 5ee6402..446dd3d 100644 (file)
--- a/usr/src/sys/netinet/ip_input.c
+++ b/usr/src/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*     ip_input.c      1.44    82/06/13        */
+/*     ip_input.c      1.45    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -28,7 +28,6 @@ ip_init()
        register struct protosw *pr;
        register int i;
 
        register struct protosw *pr;
        register int i;
 

-COUNT(IP_INIT);

        pr = pffindproto(PF_INET, IPPROTO_RAW);
        if (pr == 0)
                panic("ip_init");
        pr = pffindproto(PF_INET, IPPROTO_RAW);
        if (pr == 0)
                panic("ip_init");


@@ -62,7 +61,6 @@ ipintr()
        register struct ipq *fp;
        int hlen, s;
 
        register struct ipq *fp;
        int hlen, s;
 

-COUNT(IPINTR);

 next:
        /*
         * Get next datagram off input queue and get IP header
 next:
        /*
         * Get next datagram off input queue and get IP header


@@ -220,7 +218,6 @@ ip_reass(ip, fp)
        struct mbuf *t;
        int hlen = ip->ip_hl << 2;
        int i, next;
        struct mbuf *t;
        int hlen = ip->ip_hl << 2;
        int i, next;

-COUNT(IP_REASS);

 
        /*
         * Presence of header sizes in mbufs
 
        /*
         * Presence of header sizes in mbufs


@@ -350,7 +347,6 @@ ip_freef(fp)
 {
        register struct ipasfrag *q;
        struct mbuf *m;
 {
        register struct ipasfrag *q;
        struct mbuf *m;

-COUNT(IP_FREEF);

 
        for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next)
                m_freem(dtom(q));
 
        for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next)
                m_freem(dtom(q));


@@ -369,7 +365,6 @@ ip_enq(p, prev)
        register struct ipasfrag *p, *prev;
 {
 
        register struct ipasfrag *p, *prev;
 {
 

-COUNT(IP_ENQ);

        p->ipf_prev = prev;
        p->ipf_next = prev->ipf_next;
        prev->ipf_next->ipf_prev = p;
        p->ipf_prev = prev;
        p->ipf_next = prev->ipf_next;
        prev->ipf_next->ipf_prev = p;


@@ -383,7 +378,6 @@ ip_deq(p)
        register struct ipasfrag *p;
 {
 
        register struct ipasfrag *p;
 {
 

-COUNT(IP_DEQ);

        p->ipf_prev->ipf_next = p->ipf_next;
        p->ipf_next->ipf_prev = p->ipf_prev;
 }
        p->ipf_prev->ipf_next = p->ipf_next;
        p->ipf_next->ipf_prev = p->ipf_prev;
 }


@@ -398,7 +392,6 @@ ip_slowtimo()
        register struct ipq *fp;
        int s = splnet();
 
        register struct ipq *fp;
        int s = splnet();
 

-COUNT(IP_SLOWTIMO);

        fp = ipq.next;
        if (fp == 0) {
                splx(s);
        fp = ipq.next;
        if (fp == 0) {
                splx(s);


@@ -418,7 +411,6 @@ COUNT(IP_SLOWTIMO);
 ip_drain()
 {
 
 ip_drain()
 {
 

-COUNT(IP_DRAIN);

        while (ipq.next != &ipq)
                (void) ip_freef(ipq.next);
 }
        while (ipq.next != &ipq)
                (void) ip_freef(ipq.next);
 }


@@ -438,7 +430,6 @@ ip_dooptions(ip)
        register struct ifnet *ifp;
        struct in_addr t;
 
        register struct ifnet *ifp;
        struct in_addr t;
 

-COUNT(IP_DOOPTIONS);

        cp = (u_char *)(ip + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);
        for (; cnt > 0; cnt -= optlen, cp += optlen) {
        cp = (u_char *)(ip + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);
        for (; cnt > 0; cnt -= optlen, cp += optlen) {


@@ -545,7 +536,6 @@ ip_stripoptions(ip, mopt)
        register int i;
        register struct mbuf *m;
        int olen;
        register int i;
        register struct mbuf *m;
        int olen;

-COUNT(IP_STRIPOPTIONS);

 
        olen = (ip->ip_hl<<2) - sizeof (struct ip);
        m = dtom(ip);
 
        olen = (ip->ip_hl<<2) - sizeof (struct ip);
        m = dtom(ip);

diff --git a/usr/src/sys/netinet/ip_output.c b/usr/src/sys/netinet/ip_output.c
index 7815368..ca9f70b 100644 (file)
--- a/usr/src/sys/netinet/ip_output.c
+++ b/usr/src/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*     ip_output.c     1.34    82/06/13        */
+/*     ip_output.c     1.35    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -27,7 +27,6 @@ ip_output(m, opt, ro, allowbroadcast)
        struct route iproute;
        struct sockaddr *dst;
 
        struct route iproute;
        struct sockaddr *dst;
 

-COUNT(IP_OUTPUT);

        if (opt)                                /* XXX */
                (void) m_free(opt);             /* XXX */
        /*
        if (opt)                                /* XXX */
                (void) m_free(opt);             /* XXX */
        /*


@@ -193,7 +192,6 @@ ip_optcopy(ip, jp, off)
        register u_char *cp, *dp;
        int opt, optlen, cnt;
 
        register u_char *cp, *dp;
        int opt, optlen, cnt;
 

-COUNT(IP_OPTCOPY);

        cp = (u_char *)(ip + 1);
        dp = (u_char *)(jp + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);
        cp = (u_char *)(ip + 1);
        dp = (u_char *)(jp + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);

diff --git a/usr/src/sys/netinet/raw_ip.c b/usr/src/sys/netinet/raw_ip.c
index e7f442f..366a8a0 100644 (file)
--- a/usr/src/sys/netinet/raw_ip.c
+++ b/usr/src/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*     raw_ip.c        4.12    82/06/12        */
+/*     raw_ip.c        4.13    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -31,7 +31,6 @@ rip_input(m)
 {
        register struct ip *ip = mtod(m, struct ip *);
 
 {
        register struct ip *ip = mtod(m, struct ip *);
 

-COUNT(RIP_INPUT);

        ripproto.sp_protocol = ip->ip_p;
        ripdst.sin_addr = ip->ip_dst;
        ripsrc.sin_addr = ip->ip_src;
        ripproto.sp_protocol = ip->ip_p;
        ripdst.sin_addr = ip->ip_dst;
        ripsrc.sin_addr = ip->ip_src;


@@ -54,7 +53,6 @@ rip_output(m0, so)
        struct ifnet *ifp;
        struct sockaddr_in *sin;
 
        struct ifnet *ifp;
        struct sockaddr_in *sin;
 

-COUNT(RIP_OUTPUT);

        /*
         * Calculate data length and get an mbuf
         * for IP header.
        /*
         * Calculate data length and get an mbuf
         * for IP header.

diff --git a/usr/src/sys/netinet/tcp_input.c b/usr/src/sys/netinet/tcp_input.c
index 9ac2aea..63ac1ba 100644 (file)
--- a/usr/src/sys/netinet/tcp_input.c
+++ b/usr/src/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*     tcp_input.c     1.67    82/04/10        */
+/*     tcp_input.c     1.68    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -48,7 +48,6 @@ tcp_input(m0)
        short ostate;
        struct in_addr laddr;
 
        short ostate;
        struct in_addr laddr;
 

-COUNT(TCP_INPUT);

        /*
         * Get IP and TCP header together in first mbuf.
         * Note: IP leaves IP header in first mbuf.
        /*
         * Get IP and TCP header together in first mbuf.
         * Note: IP leaves IP header in first mbuf.


@@ -866,7 +865,6 @@ tcp_reass(tp, ti)
        struct socket *so = tp->t_inpcb->inp_socket;
        struct mbuf *m;
        int flags;
        struct socket *so = tp->t_inpcb->inp_socket;
        struct mbuf *m;
        int flags;

-COUNT(TCP_REASS);

 
        /*
         * Call with ti==0 after become established to
 
        /*
         * Call with ti==0 after become established to

diff --git a/usr/src/sys/netinet/tcp_output.c b/usr/src/sys/netinet/tcp_output.c
index 29bd18d..2b855d0 100644 (file)
--- a/usr/src/sys/netinet/tcp_output.c
+++ b/usr/src/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*     tcp_output.c    4.41    82/06/12        */
+/*     tcp_output.c    4.42    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -51,7 +51,6 @@ tcp_output(tp)
        unsigned optlen = 0;
        int sendalot;
 
        unsigned optlen = 0;
        int sendalot;
 

-COUNT(TCP_OUTPUT);

 
        /*
         * Determine length of data that should be transmitted,
 
        /*
         * Determine length of data that should be transmitted,

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index dff4dad..b1d59be 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*     tcp_subr.c      4.26    82/04/30        */
+/*     tcp_subr.c      4.27    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -28,7 +28,6 @@
 tcp_init()
 {
 
 tcp_init()
 {
 

-COUNT(TCP_INIT);

        tcp_iss = 1;            /* wrong */
        tcb.inp_next = tcb.inp_prev = &tcb;
        tcp_alpha = TCP_ALPHA;
        tcp_iss = 1;            /* wrong */
        tcb.inp_next = tcb.inp_prev = &tcb;
        tcp_alpha = TCP_ALPHA;


@@ -49,7 +48,6 @@ tcp_template(tp)
        register struct mbuf *m;
        register struct tcpiphdr *n;
 
        register struct mbuf *m;
        register struct tcpiphdr *n;
 

-COUNT(TCP_TEMPLATE);

        m = m_get(M_WAIT);
        if (m == 0)
                return (0);
        m = m_get(M_WAIT);
        if (m == 0)
                return (0);


@@ -98,7 +96,6 @@ tcp_respond(tp, ti, ack, seq, flags)
        int win = 0, tlen;
        struct route *ro = 0;
 
        int win = 0, tlen;
        struct route *ro = 0;
 

-COUNT(TCP_RESPOND);

        if (tp) {
                win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
                ro = &tp->t_inpcb->inp_route;
        if (tp) {
                win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
                ro = &tp->t_inpcb->inp_route;


@@ -160,7 +157,6 @@ tcp_newtcpcb(inp)
 {
        struct mbuf *m = m_getclr(M_DONTWAIT);
        register struct tcpcb *tp;
 {
        struct mbuf *m = m_getclr(M_DONTWAIT);
        register struct tcpcb *tp;

-COUNT(TCP_NEWTCPCB);

 
        if (m == 0)
                return (0);
 
        if (m == 0)
                return (0);


@@ -184,7 +180,6 @@ tcp_drop(tp, errno)
 {
        struct socket *so = tp->t_inpcb->inp_socket;
 
 {
        struct socket *so = tp->t_inpcb->inp_socket;
 

-COUNT(TCP_DROP);

        if (TCPS_HAVERCVDSYN(tp->t_state)) {
                tp->t_state = TCPS_CLOSED;
                tcp_output(tp);
        if (TCPS_HAVERCVDSYN(tp->t_state)) {
                tp->t_state = TCPS_CLOSED;
                tcp_output(tp);


@@ -212,7 +207,6 @@ tcp_close(tp)
        struct inpcb *inp = tp->t_inpcb;
        struct socket *so = inp->inp_socket;
 
        struct inpcb *inp = tp->t_inpcb;
        struct socket *so = inp->inp_socket;
 

-COUNT(TCP_CLOSE);

        t = tp->seg_next;
        for (; t != (struct tcpiphdr *)tp; t = (struct tcpiphdr *)t->ti_next)
                m_freem(dtom(t));
        t = tp->seg_next;
        for (; t != (struct tcpiphdr *)tp; t = (struct tcpiphdr *)t->ti_next)
                m_freem(dtom(t));


@@ -231,7 +225,6 @@ COUNT(TCP_CLOSE);
 tcp_drain()
 {
 
 tcp_drain()
 {
 

-COUNT(TCP_DRAIN);

 }
 
 tcp_ctlinput(cmd, arg)
 }
 
 tcp_ctlinput(cmd, arg)


@@ -240,7 +233,6 @@ tcp_ctlinput(cmd, arg)
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];

-COUNT(TCP_CTLINPUT);

 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;

diff --git a/usr/src/sys/netinet/tcp_timer.c b/usr/src/sys/netinet/tcp_timer.c
index df68499..9284eb9 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*     tcp_timer.c     4.22    82/06/12        */
+/*     tcp_timer.c     4.23    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -30,7 +30,6 @@ tcp_fasttimo()
        register struct inpcb *inp;
        register struct tcpcb *tp;
        int s = splnet();
        register struct inpcb *inp;
        register struct tcpcb *tp;
        int s = splnet();

-COUNT(TCP_FASTTIMO);

 
        inp = tcb.inp_next;
        if (inp)
 
        inp = tcb.inp_next;
        if (inp)


@@ -55,7 +54,6 @@ tcp_slowtimo()
        register struct tcpcb *tp;
        int s = splnet();
        register int i;
        register struct tcpcb *tp;
        int s = splnet();
        register int i;

-COUNT(TCP_SLOWTIMO);

 
        /*
         * Search through tcb's and update active timers.
 
        /*
         * Search through tcb's and update active timers.


@@ -97,7 +95,6 @@ tcp_canceltimers(tp)
 {
        register int i;
 
 {
        register int i;
 

-COUNT(TCP_CANCELTIMERS);

        for (i = 0; i < TCPT_NTIMERS; i++)
                tp->t_timer[i] = 0;
 }
        for (i = 0; i < TCPT_NTIMERS; i++)
                tp->t_timer[i] = 0;
 }


@@ -114,7 +111,6 @@ tcp_timers(tp, timer)
        int timer;
 {
 
        int timer;
 {
 

-COUNT(TCP_TIMERS);

        switch (timer) {
 
        /*
        switch (timer) {
 
        /*

diff --git a/usr/src/sys/netinet/tcp_usrreq.c b/usr/src/sys/netinet/tcp_usrreq.c
index 929d20b..5f4e32f 100644 (file)
--- a/usr/src/sys/netinet/tcp_usrreq.c
+++ b/usr/src/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*     tcp_usrreq.c    1.58    82/06/12        */
+/*     tcp_usrreq.c    1.59    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -44,7 +44,6 @@ tcp_usrreq(so, req, m, addr)
        int s = splnet();
        int error = 0;
        int ostate;
        int s = splnet();
        int error = 0;
        int ostate;

-COUNT(TCP_USRREQ);

 
        /*
         * When a TCP is attached to a socket, then there will be
 
        /*
         * When a TCP is attached to a socket, then there will be

diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index ac32641..e36e4ee 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*     udp_usrreq.c    4.29    82/06/12        */
+/*     udp_usrreq.c    4.30    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -26,7 +26,6 @@
 udp_init()
 {
 
 udp_init()
 {
 

-COUNT(UDP_INIT);

        udb.inp_next = udb.inp_prev = &udb;
 }
 
        udb.inp_next = udb.inp_prev = &udb;
 }
 


@@ -41,7 +40,6 @@ udp_input(m0)
        register struct mbuf *m;
        int len, ulen;
 
        register struct mbuf *m;
        int len, ulen;
 

-COUNT(UDP_INPUT);

        /*
         * Get IP and UDP header together in first mbuf.
         */
        /*
         * Get IP and UDP header together in first mbuf.
         */


@@ -133,7 +131,6 @@ udp_ctlinput(cmd, arg)
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];

-COUNT(UDP_CTLINPUT);

 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;


@@ -166,7 +163,6 @@ udp_output(inp, m0)
        register struct socket *so;
        register int len = 0;
 
        register struct socket *so;
        register int len = 0;
 

-COUNT(UDP_OUTPUT);

        /*
         * Calculate data length and get a mbuf
         * for UDP and IP headers.
        /*
         * Calculate data length and get a mbuf
         * for UDP and IP headers.


@@ -222,7 +218,6 @@ udp_usrreq(so, req, m, addr)
        struct inpcb *inp = sotoinpcb(so);
        int error = 0;
 
        struct inpcb *inp = sotoinpcb(so);
        int error = 0;
 

-COUNT(UDP_USRREQ);

        if (inp == 0 && req != PRU_ATTACH)
                return (EINVAL);
        switch (req) {
        if (inp == 0 && req != PRU_ATTACH)
                return (EINVAL);
        switch (req) {

diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c
index 0ed5908..12d4cf3 100644 (file)
--- a/usr/src/sys/vax/if/if_acc.c
+++ b/usr/src/sys/vax/if/if_acc.c
@@ -1,4 +1,4 @@
-/*     if_acc.c        4.18    82/06/15        */
+/*     if_acc.c        4.19    82/06/20        */

 
 #include "acc.h"
 #ifdef NACC > 0
 
 #include "acc.h"
 #ifdef NACC > 0


@@ -71,7 +71,6 @@ accprobe(reg)
        register int br, cvec;          /* r11, r10 value-result */
        register struct accdevice *addr = (struct accdevice *)reg;
 
        register int br, cvec;          /* r11, r10 value-result */
        register struct accdevice *addr = (struct accdevice *)reg;
 

-COUNT(ACCPROBE);

 #ifdef lint
        br = 0; cvec = br; br = cvec;
        accrint(0); accxint(0);
 #ifdef lint
        br = 0; cvec = br; br = cvec;
        accrint(0); accxint(0);


@@ -105,7 +104,6 @@ accattach(ui)
                struct  impcb ifimp_impcb;
        } *ifimp;
 
                struct  impcb ifimp_impcb;
        } *ifimp;
 

-COUNT(ACCATTACH);

        if ((ifimp = (struct ifimpcb *)impattach(ui)) == 0)
                panic("accattach");
        sc->acc_if = &ifimp->ifimp_if;
        if ((ifimp = (struct ifimpcb *)impattach(ui)) == 0)
                panic("accattach");
        sc->acc_if = &ifimp->ifimp_if;


@@ -129,7 +127,6 @@ accreset(unit, uban)
        register struct uba_device *ui;
        struct acc_softc *sc;
 
        register struct uba_device *ui;
        struct acc_softc *sc;
 

-COUNT(ACCRESET);

        if (unit >= NACC || (ui = accinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;
        if (unit >= NACC || (ui = accinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;


@@ -153,7 +150,6 @@ accinit(unit)
        register struct accdevice *addr;
        int info, i;
 
        register struct accdevice *addr;
        int info, i;
 

-COUNT(ACCINIT);

        if (unit >= NACC || (ui = accinfo[unit]) == 0 || ui->ui_alive == 0) {
                printf("acc%d: not alive\n", unit);
                return (0);
        if (unit >= NACC || (ui = accinfo[unit]) == 0 || ui->ui_alive == 0) {
                printf("acc%d: not alive\n", unit);
                return (0);


@@ -237,7 +233,6 @@ accstart(dev)
        struct mbuf *m;
        u_short cmd;
 
        struct mbuf *m;
        u_short cmd;
 

-COUNT(ACCSTART);

        if (sc->acc_ic->ic_oactive)
                goto restart;
        
        if (sc->acc_ic->ic_oactive)
                goto restart;
        


@@ -280,7 +275,6 @@ accxint(unit)
        register struct acc_softc *sc = &acc_softc[unit];
        register struct accdevice *addr;
 
        register struct acc_softc *sc = &acc_softc[unit];
        register struct accdevice *addr;
 

-COUNT(ACCXINT);

        addr = (struct accdevice *)accinfo[unit]->ui_addr;
        if (sc->acc_ic->ic_oactive == 0) {
                printf("acc%d: stray xmit interrupt, csr=%b\n", unit,
        addr = (struct accdevice *)accinfo[unit]->ui_addr;
        if (sc->acc_ic->ic_oactive == 0) {
                printf("acc%d: stray xmit interrupt, csr=%b\n", unit,


@@ -312,7 +306,6 @@ accrint(unit)
        struct mbuf *m;
        int len, info;
 
        struct mbuf *m;
        int len, info;
 

-COUNT(ACCRINT);

        addr = (struct accdevice *)accinfo[unit]->ui_addr;
        sc->acc_if->if_ipackets++;
 
        addr = (struct accdevice *)accinfo[unit]->ui_addr;
        sc->acc_if->if_ipackets++;
 

diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c
index 37251c5..96874d5 100644 (file)
--- a/usr/src/sys/vax/if/if_dmc.c
+++ b/usr/src/sys/vax/if/if_dmc.c
@@ -1,4 +1,4 @@
-/*     if_dmc.c        4.16    82/06/13        */
+/*     if_dmc.c        4.17    82/06/20        */

 
 #include "dmc.h"
 #if NDMC > 0
 
 #include "dmc.h"
 #if NDMC > 0


@@ -85,7 +85,6 @@ dmcprobe(reg)
        register struct dmcdevice *addr = (struct dmcdevice *)reg;
        register int i;
 
        register struct dmcdevice *addr = (struct dmcdevice *)reg;
        register int i;
 

-COUNT(DMCPROBE);

 #ifdef lint
        br = 0; cvec = br; br = cvec;
        dmcrint(0); dmcxint(0);
 #ifdef lint
        br = 0; cvec = br; br = cvec;
        dmcrint(0); dmcxint(0);


@@ -118,7 +117,6 @@ dmcattach(ui)
        register struct dmc_softc *sc = &dmc_softc[ui->ui_unit];
        register struct sockaddr_in *sin;
 
        register struct dmc_softc *sc = &dmc_softc[ui->ui_unit];
        register struct sockaddr_in *sin;
 

-COUNT(DMCATTACH);

        sc->sc_if.if_unit = ui->ui_unit;
        sc->sc_if.if_name = "dmc";
        sc->sc_if.if_mtu = DMCMTU;
        sc->sc_if.if_unit = ui->ui_unit;
        sc->sc_if.if_name = "dmc";
        sc->sc_if.if_mtu = DMCMTU;


@@ -144,7 +142,6 @@ dmcreset(unit, uban)
 {
        register struct uba_device *ui;
 
 {
        register struct uba_device *ui;
 

-COUNT(DMCRESET);

        if (unit >= NDMC || (ui = dmcinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;
        if (unit >= NDMC || (ui = dmcinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;


@@ -163,7 +160,6 @@ dmcinit(unit)
        register struct dmcdevice *addr;
        int base;
 
        register struct dmcdevice *addr;
        int base;
 

-COUNT(DMCINIT);

        printd("dmcinit\n");
        if ((sc->sc_flag&DMCBMAPPED) == 0) {
                sc->sc_ubinfo = uballoc(ui->ui_ubanum,
        printd("dmcinit\n");
        if ((sc->sc_flag&DMCBMAPPED) == 0) {
                sc->sc_ubinfo = uballoc(ui->ui_ubanum,


@@ -207,7 +203,6 @@ dmcstart(dev)
        int addr, len;
        struct mbuf *m;
 
        int addr, len;
        struct mbuf *m;
 

-COUNT(DMCSTART);

        printd("dmcstart\n");
        /*
         * Dequeue a request and map it to the UNIBUS.
        printd("dmcstart\n");
        /*
         * Dequeue a request and map it to the UNIBUS.


@@ -241,7 +236,6 @@ dmcload(sc, type, w0, w1)
        register struct dmcdevice *addr;
        register int unit, sps, n;
 
        register struct dmcdevice *addr;
        register int unit, sps, n;
 

-COUNT(DMCLOAD);

        printd("dmcload: 0x%x 0x%x 0x%x\n", type, w0, w1);
        unit = sc - dmc_softc;
        addr = (struct dmcdevice *)dmcinfo[unit]->ui_addr;
        printd("dmcload: 0x%x 0x%x 0x%x\n", type, w0, w1);
        unit = sc - dmc_softc;
        addr = (struct dmcdevice *)dmcinfo[unit]->ui_addr;


@@ -269,7 +263,6 @@ dmcrint(unit)
        register struct dmcdevice *addr;
        register int n;
 
        register struct dmcdevice *addr;
        register int n;
 

-COUNT(DMCRINT);

        addr = (struct dmcdevice *)dmcinfo[unit]->ui_addr;
        sc = &dmc_softc[unit];
        while (addr->bsel0&DMC_RDYI) {
        addr = (struct dmcdevice *)dmcinfo[unit]->ui_addr;
        sc = &dmc_softc[unit];
        while (addr->bsel0&DMC_RDYI) {


@@ -305,7 +298,6 @@ dmcxint(unit)
        register struct ifqueue *inq;
        int arg, cmd, len;
 
        register struct ifqueue *inq;
        int arg, cmd, len;
 

-COUNT(DMCXINT);

        addr = (struct dmcdevice *)ui->ui_addr;
        arg = addr->sel6;
        cmd = addr->bsel2&7;
        addr = (struct dmcdevice *)ui->ui_addr;
        arg = addr->sel6;
        cmd = addr->bsel2&7;


@@ -403,7 +395,6 @@ dmcoutput(ifp, m, dst)
        struct uba_device *ui = dmcinfo[ifp->if_unit];
        int s;
 
        struct uba_device *ui = dmcinfo[ifp->if_unit];
        int s;
 

-COUNT(DMCOUTPUT);

        printd("dmcoutput\n");
        if (dst->sa_family != (ui->ui_flags & DMC_AF)) {
                printf("dmc%d: af%d not supported\n", ifp->if_unit, pf);
        printd("dmcoutput\n");
        if (dst->sa_family != (ui->ui_flags & DMC_AF)) {
                printf("dmc%d: af%d not supported\n", ifp->if_unit, pf);

diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c
index c72cfff..9696f63 100644 (file)
--- a/usr/src/sys/vax/if/if_ec.c
+++ b/usr/src/sys/vax/if/if_ec.c
@@ -1,4 +1,4 @@
-/*     if_ec.c 4.18    82/06/17        */
+/*     if_ec.c 4.19    82/06/20        */

 
 #include "ec.h"
 
 
 #include "ec.h"
 


@@ -77,7 +77,6 @@ ecprobe(reg)
        register struct ecdevice *addr = (struct ecdevice *)reg;
        register caddr_t ecbuf = (caddr_t) &umem[0][0600000];
 
        register struct ecdevice *addr = (struct ecdevice *)reg;
        register caddr_t ecbuf = (caddr_t) &umem[0][0600000];
 

-COUNT(ECPROBE);

 #ifdef lint
        br = 0; cvec = br; br = cvec;
        ecrint(0); ecxint(0); eccollide(0);
 #ifdef lint
        br = 0; cvec = br; br = cvec;
        ecrint(0); ecxint(0); eccollide(0);


@@ -133,7 +132,6 @@ ecattach(ui)
        struct sockaddr_in *sin;
        int i, j;
        u_char *cp;
        struct sockaddr_in *sin;
        int i, j;
        u_char *cp;

-COUNT(ECATTACH);

 
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "ec";
 
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "ec";


@@ -188,7 +186,6 @@ ecreset(unit, uban)
        int unit, uban;
 {
        register struct uba_device *ui;
        int unit, uban;
 {
        register struct uba_device *ui;

-COUNT(ECRESET);

 
        if (unit >= NEC || (ui = ecinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
 
        if (unit >= NEC || (ui = ecinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)


@@ -242,7 +239,6 @@ ecstart(dev)
        struct ecdevice *addr;
        struct mbuf *m;
        caddr_t ecbuf;
        struct ecdevice *addr;
        struct mbuf *m;
        caddr_t ecbuf;

-COUNT(ECSTART);

 
        if (es->es_oactive)
                goto restart;
 
        if (es->es_oactive)
                goto restart;


@@ -270,7 +266,6 @@ ecxint(unit)
        register struct ec_softc *es = &ec_softc[unit];
        register struct ecdevice *addr =
                (struct ecdevice *)ecinfo[unit]->ui_addr;
        register struct ec_softc *es = &ec_softc[unit];
        register struct ecdevice *addr =
                (struct ecdevice *)ecinfo[unit]->ui_addr;

-COUNT(ECXINT);

 
        if (es->es_oactive == 0)
                return;
 
        if (es->es_oactive == 0)
                return;


@@ -305,7 +300,6 @@ eccollide(unit)
        int unit;
 {
        struct ec_softc *es = &ec_softc[unit];
        int unit;
 {
        struct ec_softc *es = &ec_softc[unit];

-COUNT(ECCOLLIDE);

 
        printf("ec%d: collision\n", unit);
        es->es_if.if_collisions++;
 
        printf("ec%d: collision\n", unit);
        es->es_if.if_collisions++;


@@ -376,7 +370,6 @@ ecrint(unit)
        int unit;
 {
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
        int unit;
 {
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;

-COUNT(ECRINT);

 
        while (addr->ec_rcr & EC_RDONE)
                ecread(unit);
 
        while (addr->ec_rcr & EC_RDONE)
                ecread(unit);


@@ -392,7 +385,6 @@ ecread(unit)
        int len, off, resid, ecoff, buf;
        register struct ifqueue *inq;
        caddr_t ecbuf;
        int len, off, resid, ecoff, buf;
        register struct ifqueue *inq;
        caddr_t ecbuf;

-COUNT(ECREAD);

 
        es->es_if.if_ipackets++;
        buf = addr->ec_rcr & EC_RBN;
 
        es->es_if.if_ipackets++;
        buf = addr->ec_rcr & EC_RBN;


@@ -496,7 +488,6 @@ ecoutput(ifp, m0, dst)
        register int off, i;
        struct mbuf *mcopy = (struct mbuf *) 0;         /* Null */
 
        register int off, i;
        struct mbuf *mcopy = (struct mbuf *) 0;         /* Null */
 

-COUNT(ECOUTPUT);

        switch (dst->sa_family) {
 
 #ifdef INET
        switch (dst->sa_family) {
 
 #ifdef INET


@@ -623,7 +614,6 @@ ecput(ecbuf, m)
        register u_char *bp;
        register int off;
 
        register u_char *bp;
        register int off;
 

-COUNT(ECPUT);

        for (off = 2048, mp = m; mp; mp = mp->m_next)
                off -= mp->m_len;
        *(u_short *)ecbuf = off;
        for (off = 2048, mp = m; mp; mp = mp->m_next)
                off -= mp->m_len;
        *(u_short *)ecbuf = off;


@@ -671,7 +661,6 @@ ecget(ecbuf, totlen, off0)
        register char *cp, *mcp;
        register int i;
 
        register char *cp, *mcp;
        register int i;
 

-COUNT(ECGET);

        top = 0;
        mp = ⊤
        cp = ecbuf + ECRDOFF + sizeof (struct ec_header);
        top = 0;
        mp = ⊤
        cp = ecbuf + ECRDOFF + sizeof (struct ec_header);

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index a2224d3..b4a13cb 100644 (file)
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -1,4 +1,4 @@
-/*     if_en.c 4.66    82/06/14        */
+/*     if_en.c 4.67    82/06/20        */

 
 #include "en.h"
 
 
 #include "en.h"
 


@@ -74,7 +74,6 @@ enprobe(reg)
        register int br, cvec;          /* r11, r10 value-result */
        register struct endevice *addr = (struct endevice *)reg;
 
        register int br, cvec;          /* r11, r10 value-result */
        register struct endevice *addr = (struct endevice *)reg;
 

-COUNT(ENPROBE);

 #ifdef lint
        br = 0; cvec = br; br = cvec;
        enrint(0); enxint(0); encollide(0);
 #ifdef lint
        br = 0; cvec = br; br = cvec;
        enrint(0); enxint(0); encollide(0);


@@ -101,7 +100,6 @@ enattach(ui)
 {
        register struct en_softc *es = &en_softc[ui->ui_unit];
        register struct sockaddr_in *sin;
 {
        register struct en_softc *es = &en_softc[ui->ui_unit];
        register struct sockaddr_in *sin;

-COUNT(ENATTACH);

 
        es->es_if.if_unit = ui->ui_unit;
        es->es_if.if_name = "en";
 
        es->es_if.if_unit = ui->ui_unit;
        es->es_if.if_name = "en";


@@ -131,7 +129,6 @@ enreset(unit, uban)
        int unit, uban;
 {
        register struct uba_device *ui;
        int unit, uban;
 {
        register struct uba_device *ui;

-COUNT(ENRESET);

 
        if (unit >= NEN || (ui = eninfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
 
        if (unit >= NEN || (ui = eninfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)


@@ -197,7 +194,6 @@ enstart(dev)
        register struct endevice *addr;
        struct mbuf *m;
        int dest;
        register struct endevice *addr;
        struct mbuf *m;
        int dest;

-COUNT(ENSTART);

 
        if (es->es_oactive)
                goto restart;
 
        if (es->es_oactive)
                goto restart;


@@ -254,7 +250,6 @@ enxint(unit)
        register struct uba_device *ui = eninfo[unit];
        register struct en_softc *es = &en_softc[unit];
        register struct endevice *addr = (struct endevice *)ui->ui_addr;
        register struct uba_device *ui = eninfo[unit];
        register struct en_softc *es = &en_softc[unit];
        register struct endevice *addr = (struct endevice *)ui->ui_addr;

-COUNT(ENXINT);

 
        if (es->es_oactive == 0)
                return;
 
        if (es->es_oactive == 0)
                return;


@@ -287,7 +282,6 @@ encollide(unit)
        int unit;
 {
        struct en_softc *es = &en_softc[unit];
        int unit;
 {
        struct en_softc *es = &en_softc[unit];

-COUNT(ENCOLLIDE);

 
        es->es_if.if_collisions++;
        if (es->es_oactive == 0)
 
        es->es_if.if_collisions++;
        if (es->es_oactive == 0)


@@ -341,7 +335,6 @@ enrint(unit)
        int len, plen; short resid;
        register struct ifqueue *inq;
        int off;
        int len, plen; short resid;
        register struct ifqueue *inq;
        int off;

-COUNT(ENRINT);

 
        es->es_if.if_ipackets++;
 
 
        es->es_if.if_ipackets++;
 


@@ -454,7 +447,6 @@ enoutput(ifp, m0, dst)
        register struct en_header *en;
        register int off;
 
        register struct en_header *en;
        register int off;
 

-COUNT(ENOUTPUT);

        switch (dst->sa_family) {
 
 #ifdef INET
        switch (dst->sa_family) {
 
 #ifdef INET

diff --git a/usr/src/sys/vax/if/if_il.c b/usr/src/sys/vax/if/if_il.c
index ad6e03c..ab4d78f 100644 (file)
--- a/usr/src/sys/vax/if/if_il.c
+++ b/usr/src/sys/vax/if/if_il.c
@@ -1,4 +1,4 @@
-/*     if_il.c 4.7     82/06/18        */
+/*     if_il.c 4.8     82/06/20        */

 
 #include "il.h"
 
 
 #include "il.h"
 


@@ -73,7 +73,6 @@ ilprobe(reg)
        register struct ildevice *addr = (struct ildevice *)reg;
        register i;
 
        register struct ildevice *addr = (struct ildevice *)reg;
        register i;
 

-COUNT(ILPROBE);

 #ifdef lint
        br = 0; cvec = br; br = cvec;
        ilrint(0); ilcint(0);
 #ifdef lint
        br = 0; cvec = br; br = cvec;
        ilrint(0); ilcint(0);


@@ -103,7 +102,6 @@ ilattach(ui)
        register short csr;
        struct sockaddr_in *sin;
        int i, s, ubaddr;
        register short csr;
        struct sockaddr_in *sin;
        int i, s, ubaddr;

-COUNT(ILATTACH);

 
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "il";
 
        ifp->if_unit = ui->ui_unit;
        ifp->if_name = "il";


@@ -179,7 +177,6 @@ ilreset(unit, uban)
        int unit, uban;
 {
        register struct uba_device *ui;
        int unit, uban;
 {
        register struct uba_device *ui;

-COUNT(ILRESET);

 
        if (unit >= NIL || (ui = ilinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
 
        if (unit >= NIL || (ui = ilinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)


@@ -248,7 +245,6 @@ ilstart(dev)
        register struct ildevice *addr;
        struct mbuf *m;
        short csr;
        register struct ildevice *addr;
        struct mbuf *m;
        short csr;

-COUNT(ILSTART);

 
        IF_DEQUEUE(&is->is_if.if_snd, m);
        if (m == 0)
 
        IF_DEQUEUE(&is->is_if.if_snd, m);
        if (m == 0)


@@ -277,7 +273,6 @@ ilcint(unit)
        struct uba_device *ui = ilinfo[unit];
        register struct ildevice *addr = (struct ildevice *)ui->ui_addr;
        short csr;
        struct uba_device *ui = ilinfo[unit];
        register struct ildevice *addr = (struct ildevice *)ui->ui_addr;
        short csr;

-COUNT(ILCINT);

 
        csr = addr->il_csr;
        if (is->is_oactive == 0) {
 
        csr = addr->il_csr;
        if (is->is_oactive == 0) {


@@ -332,7 +327,6 @@ ilrint(unit)
        register struct ifqueue *inq;
        short csr;
 
        register struct ifqueue *inq;
        short csr;
 

-COUNT(ILRINT);

        is->is_if.if_ipackets++;
        if (is->is_ifuba.ifu_flags & UBA_NEEDBDP)
                UBAPURGE(is->is_ifuba.ifu_uba, is->is_ifuba.ifu_r.ifrw_bdp);
        is->is_if.if_ipackets++;
        if (is->is_ifuba.ifu_flags & UBA_NEEDBDP)
                UBAPURGE(is->is_ifuba.ifu_uba, is->is_ifuba.ifu_r.ifrw_bdp);


@@ -438,7 +432,6 @@ iloutput(ifp, m0, dst)
        register struct il_xheader *il;
        register int off, i;
 
        register struct il_xheader *il;
        register int off, i;
 

-COUNT(ILOUTPUT);

        switch (dst->sa_family) {
 
 #ifdef INET
        switch (dst->sa_family) {
 
 #ifdef INET

diff --git a/usr/src/sys/vax/if/if_uba.c b/usr/src/sys/vax/if/if_uba.c
index c9298a2..298ff67 100644 (file)
--- a/usr/src/sys/vax/if/if_uba.c
+++ b/usr/src/sys/vax/if/if_uba.c
@@ -1,4 +1,4 @@
-/*     if_uba.c        4.11    82/05/19        */
+/*     if_uba.c        4.12    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -38,7 +38,6 @@ if_ubainit(ifu, uban, hlen, nmr)
        register caddr_t cp;
        int i, ncl;
 
        register caddr_t cp;
        int i, ncl;
 

-COUNT(IF_UBAINIT);

        ncl = clrnd(nmr + CLSIZE) / CLSIZE;
        if (ifu->ifu_r.ifrw_addr)
                cp = ifu->ifu_r.ifrw_addr - (CLBYTES - hlen);
        ncl = clrnd(nmr + CLSIZE) / CLSIZE;
        if (ifu->ifu_r.ifrw_addr)
                cp = ifu->ifu_r.ifrw_addr - (CLBYTES - hlen);


@@ -81,7 +80,6 @@ if_ubaalloc(ifu, ifrw, nmr)
 {
        register int info;
 
 {
        register int info;
 

-COUNT(IF_UBAALLOC);

        info =
            uballoc(ifu->ifu_uban, ifrw->ifrw_addr, nmr*NBPG + ifu->ifu_hlen,
                ifu->ifu_flags);
        info =
            uballoc(ifu->ifu_uban, ifrw->ifrw_addr, nmr*NBPG + ifu->ifu_hlen,
                ifu->ifu_flags);


@@ -113,7 +111,6 @@ if_rubaget(ifu, totlen, off0)
        int off = off0, len;
        register caddr_t cp = ifu->ifu_r.ifrw_addr + ifu->ifu_hlen;
 
        int off = off0, len;
        register caddr_t cp = ifu->ifu_r.ifrw_addr + ifu->ifu_hlen;
 

-COUNT(IF_RUBAGET);

 
        top = 0;
        mp = ⊤
 
        top = 0;
        mp = ⊤


@@ -202,7 +199,6 @@ if_wubaput(ifu, m)
        int xswapd = 0;
        int x, cc;
 
        int xswapd = 0;
        int x, cc;
 

-COUNT(IF_WUBAPUT);

        cp = ifu->ifu_w.ifrw_addr;
        while (m) {
                dp = mtod(m, char *);
        cp = ifu->ifu_w.ifrw_addr;
        while (m) {
                dp = mtod(m, char *);

diff --git a/usr/src/sys/vax/if/if_vv.c b/usr/src/sys/vax/if/if_vv.c
index ffca6bc..b16f8ba 100644 (file)
--- a/usr/src/sys/vax/if/if_vv.c
+++ b/usr/src/sys/vax/if/if_vv.c
@@ -1,4 +1,4 @@
-/*     if_vv.c 4.4     82/06/15        */
+/*     if_vv.c 4.5     82/06/20        */

 
 /*
  * Proteon 10 Meg Ring Driver.
 
 /*
  * Proteon 10 Meg Ring Driver.


@@ -112,7 +112,6 @@ vvattach(ui)
 {
        register struct vv_softc *vs = &vv_softc[ui->ui_unit];
        register struct sockaddr_in *sin;
 {
        register struct vv_softc *vs = &vv_softc[ui->ui_unit];
        register struct sockaddr_in *sin;

-COUNT(VVATTACH);

 
        vs->vs_if.if_unit = ui->ui_unit;
        vs->vs_if.if_name = "vv";
 
        vs->vs_if.if_unit = ui->ui_unit;
        vs->vs_if.if_name = "vv";


@@ -144,7 +143,6 @@ vvreset(unit, uban)
        int unit, uban;
 {
        register struct uba_device *ui;
        int unit, uban;
 {
        register struct uba_device *ui;

-COUNT(VVRESET);

 
        if (unit >= NVV || (ui = vvinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
 
        if (unit >= NVV || (ui = vvinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)


@@ -312,7 +310,6 @@ vvstart(dev)
        struct mbuf *m;
        int ubainfo;
        int dest;
        struct mbuf *m;
        int ubainfo;
        int dest;

-COUNT(VVSTART);

 
        if (vs->vs_oactive)
                goto restart;
 
        if (vs->vs_oactive)
                goto restart;


@@ -358,7 +355,6 @@ vvxint(unit)
        register struct vv_softc *vs = &vv_softc[unit];
        register struct vvreg *addr;
        register int oc;
        register struct vv_softc *vs = &vv_softc[unit];
        register struct vvreg *addr;
        register int oc;

-COUNT(ENXINT);

 
        addr = (struct vvreg *)ui->ui_addr;
        oc = 0xffff & (addr->vvocsr);
 
        addr = (struct vvreg *)ui->ui_addr;
        oc = 0xffff & (addr->vvocsr);


@@ -416,7 +412,6 @@ vvrint(unit)
        register struct ifqueue *inq;
        struct mbuf *m;
        int ubainfo, len, off;
        register struct ifqueue *inq;
        struct mbuf *m;
        int ubainfo, len, off;

-COUNT(VVRINT);

 
        vs->vs_if.if_ipackets++;
        /*
 
        vs->vs_if.if_ipackets++;
        /*

diff --git a/usr/src/sys/vax/vax/in_cksum.c b/usr/src/sys/vax/vax/in_cksum.c
index 2b81da1..027c265 100644 (file)
--- a/usr/src/sys/vax/vax/in_cksum.c
+++ b/usr/src/sys/vax/vax/in_cksum.c
@@ -1,4 +1,4 @@
-/* in_cksum.c 1.11 81/11/26 */
+/* in_cksum.c 1.12 82/06/20 */

 
 #include <sys/types.h>
 #include "../h/mbuf.h"
 
 #include <sys/types.h>
 #include "../h/mbuf.h"


@@ -19,7 +19,6 @@ in_cksum(m, len)
        register u_short *w;            /* known to be r9 */
        register int sum = 0;           /* known to be r8 */
        register int mlen = 0;
        register u_short *w;            /* known to be r9 */
        register int sum = 0;           /* known to be r8 */
        register int mlen = 0;

-COUNT(IN_CKSUM);

 
        for (;;) {
                /*
 
        for (;;) {
                /*