From owner-p4-projects@FreeBSD.ORG Wed Jul 27 16:20:59 2011 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69CF61065672; Wed, 27 Jul 2011 16:20:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB19106564A for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:59 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 199F48FC14 for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6RGKwW1056416 for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:58 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6RGKwNE056412 for perforce@freebsd.org; Wed, 27 Jul 2011 16:20:58 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 27 Jul 2011 16:20:58 GMT Message-Id: <201107271620.p6RGKwNE056412@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA <syuu@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Precedence: bulk Cc: Subject: PERFORCE change 196790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 27 Jul 2011 16:20:59 -0000 http://p4web.freebsd.org/@@196790?ac=10 Change 196790 by syuu@kikurage on 2011/07/27 16:20:08 drop debug log Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#20 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#20 (text+ko) ==== @@ -58,7 +58,6 @@ #include <sys/sockio.h> #include <sys/ttycom.h> #include <sys/uio.h> -#include <sys/syslog.h> #include <sys/event.h> #include <sys/file.h> @@ -1522,7 +1521,6 @@ struct ifnet *ifp; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1531,7 +1529,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (d->bd_qmask.qm_enabled) { - log(LOG_ERR, "d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1539,7 +1536,6 @@ ifp = d->bd_bif->bif_ifp; if (!(ifp->if_capabilities & (IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))) { - log(LOG_ERR, "if doesn't support multiqueue\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1561,7 +1557,6 @@ case BIOCDISQMASK: { if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1570,7 +1565,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1589,7 +1583,6 @@ int index; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1598,7 +1591,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1606,7 +1598,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { - log(LOG_ERR, "BIOCSTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1622,7 +1613,6 @@ struct ifnet *ifp; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1631,7 +1621,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1639,7 +1628,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { - log(LOG_ERR, "BIOCCRRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1655,7 +1643,6 @@ struct ifnet *ifp; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1664,7 +1651,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1672,7 +1658,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { - log(LOG_ERR, "BIOCGTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1688,7 +1673,6 @@ int index; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1697,7 +1681,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1706,7 +1689,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { - log(LOG_ERR, "BIOCSTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1722,7 +1704,6 @@ int index; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1731,7 +1712,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1740,7 +1720,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { - log(LOG_ERR, "BIOCCRTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1756,7 +1735,6 @@ struct ifnet *ifp; if (d->bd_bif == NULL) { - log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ @@ -1765,7 +1743,6 @@ } BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { - log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -1773,7 +1750,6 @@ ifp = d->bd_bif->bif_ifp; index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { - log(LOG_ERR, "BIOCGTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; @@ -2189,7 +2165,6 @@ struct ifnet *ifp = bp->bif_ifp; if (m->m_pkthdr.rxqueue != (uint32_t)-1) { if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { - log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &if_tracker); return; @@ -2201,7 +2176,6 @@ } if (m->m_pkthdr.txqueue != (uint32_t)-1) { if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { - log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &if_tracker); return; @@ -2289,7 +2263,6 @@ struct ifnet *ifp = bp->bif_ifp; if (m->m_pkthdr.rxqueue != (uint32_t)-1) { if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { - log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &if_tracker); return; @@ -2301,7 +2274,6 @@ } if (m->m_pkthdr.txqueue != (uint32_t)-1) { if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { - log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &if_tracker); return;