From owner-p4-projects@FreeBSD.ORG Sun Oct 28 22:22:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06E8516A46D; Sun, 28 Oct 2007 22:22:18 +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 A3F6116A417 for ; Sun, 28 Oct 2007 22:22:17 +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 9479413C48E for ; Sun, 28 Oct 2007 22:22:17 +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 l9SMMHJJ059273 for ; Sun, 28 Oct 2007 22:22:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SMMHoK059270 for perforce@freebsd.org; Sun, 28 Oct 2007 22:22:17 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 28 Oct 2007 22:22:17 GMT Message-Id: <200710282222.l9SMMHoK059270@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 128253 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: Sun, 28 Oct 2007 22:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=128253 Change 128253 by kmacy@kmacy:storage:toestack on 2007/10/28 22:21:17 - set the length on a control mbuf so memcpy doesn't get passed -8 - call callout_stop on callouts, callout_drain still doesn't seem to do the trick - don't disable offload by default Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#12 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#12 (text+ko) ==== @@ -203,7 +203,7 @@ * The driver enables offload as a default. * To disable it, use ofld_disable = 1. */ -static int ofld_disable = 1; +static int ofld_disable = 0; TUNABLE_INT("hw.cxgb.ofld_disable", &ofld_disable); SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0, "disable ULP offload"); @@ -1301,6 +1301,8 @@ return (ENOMEM); req = mtod(m, struct cpl_smt_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(struct cpl_smt_write_req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SMT_WRITE_REQ, idx)); req->mtu_idx = NMTUS - 1; /* should be 0 but there's a T3 bug */ @@ -1587,6 +1589,8 @@ cxgb_teardown_msix(sc); ADAPTER_UNLOCK(sc); + callout_stop(&sc->cxgb_tick_ch); + callout_stop(&sc->sge_timer_ch); callout_drain(&sc->cxgb_tick_ch); callout_drain(&sc->sge_timer_ch); @@ -1761,7 +1765,6 @@ ADAPTER_LOCK(p->adapter); clrbit(&p->adapter->open_device_map, p->port_id); - if (p->adapter->open_device_map == 0) { cxgb_down_locked(p->adapter); } else