Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 13 Feb 2012 19:18:08 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r231598 - in stable/8/sys/dev: cxgb cxgbe
Message-ID:  <201202131918.q1DJI8YV057576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Mon Feb 13 19:18:08 2012
New Revision: 231598
URL: http://svn.freebsd.org/changeset/base/231598

Log:
  MFC r231116:
  Remove if_start from cxgb and cxgbe.

Modified:
  stable/8/sys/dev/cxgb/cxgb_adapter.h
  stable/8/sys/dev/cxgb/cxgb_main.c
  stable/8/sys/dev/cxgb/cxgb_sge.c
  stable/8/sys/dev/cxgbe/t4_main.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_adapter.h	Mon Feb 13 19:17:43 2012	(r231597)
+++ stable/8/sys/dev/cxgb/cxgb_adapter.h	Mon Feb 13 19:18:08 2012	(r231598)
@@ -572,5 +572,4 @@ static inline int offload_running(adapte
 void cxgb_tx_watchdog(void *arg);
 int cxgb_transmit(struct ifnet *ifp, struct mbuf *m);
 void cxgb_qflush(struct ifnet *ifp);
-void cxgb_start(struct ifnet *ifp);
 #endif

Modified: stable/8/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_main.c	Mon Feb 13 19:17:43 2012	(r231597)
+++ stable/8/sys/dev/cxgb/cxgb_main.c	Mon Feb 13 19:18:08 2012	(r231598)
@@ -227,14 +227,6 @@ TUNABLE_INT("hw.cxgb.use_16k_clusters", 
 SYSCTL_INT(_hw_cxgb, OID_AUTO, use_16k_clusters, CTLFLAG_RDTUN,
     &cxgb_use_16k_clusters, 0, "use 16kB clusters for the jumbo queue ");
 
-/*
- * Tune the size of the output queue.
- */
-int cxgb_snd_queue_len = IFQ_MAXLEN;
-TUNABLE_INT("hw.cxgb.snd_queue_len", &cxgb_snd_queue_len);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, snd_queue_len, CTLFLAG_RDTUN,
-    &cxgb_snd_queue_len, 0, "send queue size ");
-
 static int nfilters = -1;
 TUNABLE_INT("hw.cxgb.nfilters", &nfilters);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, nfilters, CTLFLAG_RDTUN,
@@ -1019,11 +1011,8 @@ cxgb_port_attach(device_t dev)
 	ifp->if_softc = p;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = cxgb_ioctl;
-	ifp->if_start = cxgb_start;
-
-	ifp->if_snd.ifq_drv_maxlen = max(cxgb_snd_queue_len, ifqmaxlen);
-	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
-	IFQ_SET_READY(&ifp->if_snd);
+	ifp->if_transmit = cxgb_transmit;
+	ifp->if_qflush = cxgb_qflush;
 
 	ifp->if_capabilities = CXGB_CAP;
 	ifp->if_capenable = CXGB_CAP_ENABLE;
@@ -1039,8 +1028,6 @@ cxgb_port_attach(device_t dev)
 	}
 
 	ether_ifattach(ifp, p->hw_addr);
-	ifp->if_transmit = cxgb_transmit;
-	ifp->if_qflush = cxgb_qflush;
 
 #ifdef DEFAULT_JUMBO
 	if (sc->params.nports <= 2)

Modified: stable/8/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_sge.c	Mon Feb 13 19:17:43 2012	(r231597)
+++ stable/8/sys/dev/cxgb/cxgb_sge.c	Mon Feb 13 19:18:08 2012	(r231598)
@@ -1767,19 +1767,6 @@ cxgb_transmit(struct ifnet *ifp, struct 
 		error = drbr_enqueue(ifp, qs->txq[TXQ_ETH].txq_mr, m);
 	return (error);
 }
-void
-cxgb_start(struct ifnet *ifp)
-{
-	struct port_info *pi = ifp->if_softc;
-	struct sge_qset *qs = &pi->adapter->sge.qs[pi->first_qset];
-	
-	if (!pi->link_config.link_ok)
-		return;
-
-	TXQ_LOCK(qs);
-	cxgb_start_locked(qs);
-	TXQ_UNLOCK(qs);
-}
 
 void
 cxgb_qflush(struct ifnet *ifp)

Modified: stable/8/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/8/sys/dev/cxgbe/t4_main.c	Mon Feb 13 19:17:43 2012	(r231597)
+++ stable/8/sys/dev/cxgbe/t4_main.c	Mon Feb 13 19:18:08 2012	(r231598)
@@ -112,7 +112,6 @@ static struct cdevsw t4_cdevsw = {
 /* ifnet + media interface */
 static void cxgbe_init(void *);
 static int cxgbe_ioctl(struct ifnet *, unsigned long, caddr_t);
-static void cxgbe_start(struct ifnet *);
 static int cxgbe_transmit(struct ifnet *, struct mbuf *);
 static void cxgbe_qflush(struct ifnet *);
 static int cxgbe_media_change(struct ifnet *);
@@ -829,14 +828,9 @@ cxgbe_attach(device_t dev)
 
 	ifp->if_init = cxgbe_init;
 	ifp->if_ioctl = cxgbe_ioctl;
-	ifp->if_start = cxgbe_start;
 	ifp->if_transmit = cxgbe_transmit;
 	ifp->if_qflush = cxgbe_qflush;
 
-	ifp->if_snd.ifq_drv_maxlen = 1024;
-	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
-	IFQ_SET_READY(&ifp->if_snd);
-
 	ifp->if_capabilities = T4_CAP;
 #ifndef TCP_OFFLOAD_DISABLE
 	if (is_offload(pi->adapter))
@@ -1095,21 +1089,6 @@ fail:
 	return (rc);
 }
 
-static void
-cxgbe_start(struct ifnet *ifp)
-{
-	struct port_info *pi = ifp->if_softc;
-	struct sge_txq *txq;
-	int i;
-
-	for_each_txq(pi, i, txq) {
-		if (TXQ_TRYLOCK(txq)) {
-			txq_start(ifp, txq);
-			TXQ_UNLOCK(txq);
-		}
-	}
-}
-
 static int
 cxgbe_transmit(struct ifnet *ifp, struct mbuf *m)
 {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202131918.q1DJI8YV057576>