PERFORCE change 125094 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=125094

Change 125094 by kmacy at 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) {						\