svn commit: r193364 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
Kip Macy
kmacy at FreeBSD.org
Wed Jun 3 03:14:31 UTC 2009
Author: kmacy
Date: Wed Jun 3 03:14:30 2009
New Revision: 193364
URL: http://svn.freebsd.org/changeset/base/193364
Log:
enable cxgb_transmit, remove OACTIVE flag check
Modified:
user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Wed Jun 3 02:06:49 2009 (r193363)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Wed Jun 3 03:14:30 2009 (r193364)
@@ -602,6 +602,7 @@ static inline int offload_running(adapte
}
int cxgb_transmit(struct ifnet *ifp, struct mbuf *m);
+void cxgb_qflush(struct ifnet *ifp);
int process_responses(adapter_t *adap, struct sge_qset *qs, int budget);
void t3_free_qset(adapter_t *sc, struct sge_qset *q);
void cxgb_start(struct ifnet *ifp);
Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Wed Jun 3 02:06:49 2009 (r193363)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Wed Jun 3 03:14:30 2009 (r193364)
@@ -956,10 +956,8 @@ cxgb_port_attach(device_t dev)
}
ether_ifattach(ifp, p->hw_addr);
-#ifdef IFNET_BUF_RING
ifp->if_transmit = cxgb_transmit;
ifp->if_qflush = cxgb_qflush;
-#endif
/*
* Only default to jumbo frames on 10GigE
*/
Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Wed Jun 3 02:06:49 2009 (r193363)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Wed Jun 3 03:14:30 2009 (r193364)
@@ -1509,13 +1509,7 @@ cxgb_transmit_locked(struct ifnet *ifp,
int error, count = 1;
TXQ_LOCK_ASSERT(qs);
- /*
- * XXX FIX ME
- *
- */
- if (((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) !=
- IFF_DRV_RUNNING)
- || (!pi->link_config.link_ok)) {
+ if ((!pi->link_config.link_ok) /* check others */) {
error = drbr_enqueue(ifp, br, m);
return (error);
} else if (TXQ_RING_EMPTY(qs) && sc->tunq_coalesce == 0) {
@@ -1585,6 +1579,16 @@ cxgb_start(struct ifnet *ifp)
TXQ_UNLOCK(qs);
}
+void
+cxgb_qflush(struct ifnet *ifp)
+{
+ /*
+ * flush any enqueued mbufs in the buf_rings
+ * and in the transmit queues
+ * no-op for now
+ */
+ return;
+}
/**
* write_imm - write a packet into a Tx descriptor as immediate data
More information about the svn-src-user
mailing list