PERFORCE change 129149 for review

[Kip Macy]

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

Change 129149 by kmacy at kmacy:storage:toestack on 2007/11/17 03:29:49

	IFethng 129148

Affected files ...

.. //depot/projects/toestack/sys/net/if.c#3 integrate
.. //depot/projects/toestack/sys/net/if_var.h#4 integrate

Differences ...

==== //depot/projects/toestack/sys/net/if.c#3 (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/toestack/sys/net/if_var.h#4 (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	
 };