From owner-p4-projects@FreeBSD.ORG Sat Nov 17 02:00:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D30016A46C; Sat, 17 Nov 2007 02:00:43 +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 094B116A469 for ; Sat, 17 Nov 2007 02:00:43 +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 D0A1613C468 for ; Sat, 17 Nov 2007 02:00:42 +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 lAH20gQ4099438 for ; Sat, 17 Nov 2007 02:00:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH20gVf099435 for perforce@freebsd.org; Sat, 17 Nov 2007 02:00:42 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 02:00:42 GMT Message-Id: <200711170200.lAH20gVf099435@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 129148 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: Sat, 17 Nov 2007 02:00:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=129148 Change 129148 by kmacy@kmacy_home:ethng on 2007/11/17 02:00:24 remove unused ifnet entry points Affected files ... .. //depot/projects/ethng/src/sys/net/if.c#5 edit .. //depot/projects/ethng/src/sys/net/if_var.h#7 edit Differences ... ==== //depot/projects/ethng/src/sys/net/if.c#5 (text+ko) ==== @@ -2680,9 +2680,6 @@ return (retval); } -#ifdef IFNET_MULTIQUEUE -int ifnet_multiqueue = 1; - int if_mq_start(struct ifnet *ifp, struct mbuf *m) { @@ -2692,30 +2689,6 @@ return (*(ifp)->if_mq_start)(ifp, m); } - -int -if_mq_enqueue_packet(struct ifnet *ifp, struct mbuf *m) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_enqueue_packet)(ifp, m); -} - -int32_t -if_mq_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport, struct in6_addr *rip, uint16_t rport, int ipv6) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_get_cookie)(ifp, lip, lport, rip, rport, ipv6); -} -#else -int ifnet_multiqueue = 0; -#endif - - - /* * When an interface is marked IFF_NEEDSGIANT, its if_start() routine cannot * be called without Giant. However, we often can't acquire the Giant lock ==== //depot/projects/ethng/src/sys/net/if_var.h#7 (text+ko) ==== @@ -156,6 +156,8 @@ (struct ifnet *, struct mbuf *); void (*if_start) /* initiate output routine */ (struct ifnet *); + int (*if_mq_start) /* initiate output routine with immediate */ + (struct ifnet *, struct mbuf *); int (*if_ioctl) /* ioctl routine */ (struct ifnet *, u_long, caddr_t); void (*if_watchdog) /* timer routine */ @@ -192,12 +194,6 @@ void *if_pf_kif; void *if_lagg; /* lagg glue */ #ifdef IFNET_MULTIQUEUE - int (*if_mq_start) /* initiate output routine with immediate */ - (struct ifnet *, struct mbuf *); - int (*if_mq_enqueue_packet) /* enqueue packet to the appropriate queue */ - (struct ifnet *, struct mbuf *); - int32_t (*if_mq_get_cookie) /* calculate the txq cookie for this connection */ - (struct ifnet *, struct in6_addr *, uint16_t, struct in6_addr *, uint16_t, int); #endif };