From owner-cvs-src@FreeBSD.ORG Sat Aug 25 23:55:22 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C94D16A41A; Sat, 25 Aug 2007 23:55:22 +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 DF17213C481; Sat, 25 Aug 2007 23:55:21 +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 l7PNtLTI029775; Sat, 25 Aug 2007 23:55:21 GMT (envelope-from kmacy@repoman.freebsd.org) Received: (from kmacy@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7PNtLLD029774; Sat, 25 Aug 2007 23:55:21 GMT (envelope-from kmacy) Message-Id: <200708252355.l7PNtLLD029774@repoman.freebsd.org> From: Kip Macy Date: Sat, 25 Aug 2007 23:55:21 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/dev/cxgb cxgb_adapter.h cxgb_lro.c cxgb_main.c cxgb_sge.c src/sys/dev/cxgb/common cxgb_vsc8211.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2007 23:55:22 -0000 kmacy 2007-08-25 23:55:21 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/cxgb cxgb_adapter.h cxgb_lro.c cxgb_main.c cxgb_sge.c sys/dev/cxgb/common cxgb_vsc8211.c Log: MFC: Fixes for 4 port and small packet optimization - remove cpl->iff panic - we can't know the port number from the rspq on the 4-port - pick the ifnet based on the interface in the CPL header - switch to using qset 0 for egress on the 4-port for now - may change when we start using RSS - move ether_ifdetach to before the port lock gets deinitialized to avoid hang in the case where there are BPF peers (cxgb_ioctl is called indirectly when BPF peers are present) - don't call t3_mac_reset if multiport is set, this was causing tx errors by misconfiguring the MAC on the 4-port - change V_TXPKT_INTF to use txpkt_intf as the interfaces are not contiguous - free the mbuf immediately in the case where the payload is small enough to be copied into the rspq - only update the coalesce timer if for a queue if packets were taken off of it - add in missed 20ms DELAY in initializaton vsc8211 - prompt MFC as this only applies to the 4-port which is currently completely broken - OK'd by kensmith Supported by: Chelsio Revision Changes Path 1.1.2.3 +1 -0 src/sys/dev/cxgb/common/cxgb_vsc8211.c 1.2.2.8 +8 -5 src/sys/dev/cxgb/cxgb_adapter.h 1.1.2.4 +7 -7 src/sys/dev/cxgb/cxgb_lro.c 1.3.2.9 +81 -45 src/sys/dev/cxgb/cxgb_main.c 1.2.2.8 +28 -35 src/sys/dev/cxgb/cxgb_sge.c