From owner-svn-src-user@FreeBSD.ORG Thu Jun 4 04:29:15 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D832F106566B;
Thu, 4 Jun 2009 04:29:15 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id C662E8FC16;
Thu, 4 Jun 2009 04:29:15 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n544TFxb077163;
Thu, 4 Jun 2009 04:29:15 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n544TFYg077162;
Thu, 4 Jun 2009 04:29:15 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906040429.n544TFYg077162@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 4 Jun 2009 04:29:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r193425 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2009 04:29:16 -0000
Author: kmacy
Date: Thu Jun 4 04:29:15 2009
New Revision: 193425
URL: http://svn.freebsd.org/changeset/base/193425
Log:
don't use flags from descriptor
Modified:
user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
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 Thu Jun 4 04:11:27 2009 (r193424)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Thu Jun 4 04:29:15 2009 (r193425)
@@ -2630,8 +2630,8 @@ get_packet(adapter_t *adap, unsigned int
struct sge_fl *fl = (len_cq & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
struct rx_sw_desc *sd = &fl->sdesc[fl->cidx];
uint32_t len = G_RSPD_LEN(len_cq);
- uint32_t flags = ntohl(r->flags);
- uint8_t sopeop = G_RSPD_SOP_EOP(flags);
+ uint32_t flags = M_EXT;
+ uint8_t sopeop = G_RSPD_SOP_EOP(ntohl(r->flags));
caddr_t cl;
struct mbuf *m, *m0;
int ret = 0;
@@ -2650,6 +2650,7 @@ get_packet(adapter_t *adap, unsigned int
recycle_rx_buf(adap, fl, fl->cidx);
m = m0;
m0->m_len = len;
+ m0->m_flags = 0;
} else {
skip_recycle:
@@ -2662,7 +2663,7 @@ get_packet(adapter_t *adap, unsigned int
flags = M_PKTHDR;
if (fl->zone != zone_pack)
m_cljset(m0, cl, fl->type);
- m0->m_flags |= flags;
+ m0->m_flags = flags;
m0->m_next = m0->m_nextpkt = NULL;
m0->m_pkthdr.len = m0->m_len = len;
}