From owner-p4-projects@FreeBSD.ORG Wed Aug 8 08:15:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F52916A420; Wed, 8 Aug 2007 08:15:08 +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 78A9B16A418 for ; Wed, 8 Aug 2007 08:15:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6374813C465 for ; Wed, 8 Aug 2007 08:15:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l788F8j0009984 for ; Wed, 8 Aug 2007 08:15:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l788F8OT009981 for perforce@freebsd.org; Wed, 8 Aug 2007 08:15:08 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 8 Aug 2007 08:15:08 GMT Message-Id: <200708080815.l788F8OT009981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 124883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2007 08:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=124883 Change 124883 by kmacy@kmacy_home:ethng on 2007/08/08 08:15:05 fix fallout from last change for singleq case Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#5 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#8 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#5 (text+ko) ==== @@ -578,11 +578,11 @@ struct in6_addr *rip, uint16_t rport, int ipv6); void cxgb_pcpu_shutdown_threads(struct adapter *sc); void cxgb_pcpu_startup_threads(struct adapter *sc); -void cxgb_start(struct ifnet *ifp); -struct mbuf *cxgb_dequeue_packet(struct ifnet *ifp, struct sge_txq *unused); #endif void t3_free_qset(adapter_t *sc, struct sge_qset *q); int cxgb_tx_common(struct ifnet *ifp, struct sge_qset *qs, uint32_t txmax); +struct mbuf *cxgb_dequeue_packet(struct ifnet *ifp, struct sge_txq *unused); +void cxgb_start(struct ifnet *ifp); #endif ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#8 (text+ko) ==== @@ -2032,7 +2032,7 @@ } #ifndef IFNET_MULTIQUEUE -static inline struct mbuf * +struct mbuf * cxgb_dequeue_packet(struct ifnet *ifp, struct sge_txq *unused) { struct mbuf *m; @@ -2041,7 +2041,7 @@ return (m); } -static void +void cxgb_start(struct ifnet *ifp) { struct port_info *pi = ifp->if_softc;