From owner-p4-projects@FreeBSD.ORG Mon Aug 13 01:08:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5926116A41B; Mon, 13 Aug 2007 01:08:16 +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 1E00A16A417 for ; Mon, 13 Aug 2007 01:08:16 +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 0B86313C467 for ; Mon, 13 Aug 2007 01:08:16 +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 l7D18F6C064398 for ; Mon, 13 Aug 2007 01:08:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7D18Feq064395 for perforce@freebsd.org; Mon, 13 Aug 2007 01:08:15 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 13 Aug 2007 01:08:15 GMT Message-Id: <200708130108.l7D18Feq064395@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 125094 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: Mon, 13 Aug 2007 01:08:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=125094 Change 125094 by kmacy@kmacy_home:ethng on 2007/08/13 01:07:21 since the rss hash is passed in the mbuf we no longer need to pass a cookie Affected files ... .. //depot/projects/ethng/src/sys/net/if.c#3 edit .. //depot/projects/ethng/src/sys/net/if_var.h#4 edit Differences ... ==== //depot/projects/ethng/src/sys/net/if.c#3 (text+ko) ==== @@ -2684,22 +2684,22 @@ int ifnet_multiqueue = 1; int -if_mq_start(struct ifnet *ifp, int32_t cookie, struct mbuf *m) +if_mq_start(struct ifnet *ifp, struct mbuf *m) { KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - return (*(ifp)->if_mq_start)(ifp, cookie, m); + return (*(ifp)->if_mq_start)(ifp, m); } int -if_mq_enqueue_packet(struct ifnet *ifp, int32_t cookie, struct mbuf *m) +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, cookie, m); + return (*(ifp)->if_mq_enqueue_packet)(ifp, m); } int32_t ==== //depot/projects/ethng/src/sys/net/if_var.h#4 (text+ko) ==== @@ -192,9 +192,9 @@ void *if_lagg; /* lagg glue */ #ifdef IFNET_MULTIQUEUE int (*if_mq_start) /* initiate output routine with immediate */ - (struct ifnet *, int32_t, struct mbuf *); + (struct ifnet *, struct mbuf *); int (*if_mq_enqueue_packet) /* enqueue packet to the appropriate queue */ - (struct ifnet *, int32_t, struct mbuf *); + (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 @@ -390,8 +390,8 @@ void if_start(struct ifnet *); #ifdef IFNET_MULTIQUEUE -int if_mq_start(struct ifnet *, int32_t, struct mbuf *); -int if_mq_enqueue_packet(struct ifnet *, int32_t, struct mbuf *); +int if_mq_start(struct ifnet *, struct mbuf *); +int if_mq_enqueue_packet(struct ifnet *, struct mbuf *); 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); #endif extern int ifnet_multiqueue; /* allow driver module to confirm that multiqueue is supported */ @@ -486,7 +486,7 @@ \ len = (m)->m_pkthdr.len; \ mflags = (m)->m_flags; \ - err = if_mq_start((ifp), cookie, m); \ + err = if_mq_start((ifp), m); \ if ((err) == 0) { \ (ifp)->if_obytes += len + (adj); \ if (mflags & M_MCAST) \ @@ -510,7 +510,7 @@ len = (m)->m_pkthdr.len; \ mflags = (m)->m_flags; \ if ((ifp)->if_flags & IFF_MULTIQ) \ - err = if_mq_start((ifp), -1, m); \ + err = if_mq_start((ifp), m); \ else \ IFQ_ENQUEUE(&(ifp)->if_snd, m, err); \ if ((err) == 0) { \