From owner-freebsd-net@FreeBSD.ORG  Wed Dec  8 11:06:48 2004
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7720F16A4CE
	for <freebsd-net@freebsd.org>; Wed,  8 Dec 2004 11:06:48 +0000 (GMT)
Received: from fledge.watson.org (fledge.watson.org [204.156.12.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2249643D49
	for <freebsd-net@freebsd.org>; Wed,  8 Dec 2004 11:06:48 +0000 (GMT)
	(envelope-from robert@fledge.watson.org)
Received: from fledge.watson.org (localhost [127.0.0.1])
	by fledge.watson.org (8.13.1/8.13.1) with ESMTP id iB8B4M38098863;
	Wed, 8 Dec 2004 06:04:22 -0500 (EST)
	(envelope-from robert@fledge.watson.org)
Received: from localhost (robert@localhost)iB8B4M9u098860;
	Wed, 8 Dec 2004 11:04:22 GMT	(envelope-from robert@fledge.watson.org)
Date: Wed, 8 Dec 2004 11:04:22 +0000 (GMT)
From: Robert Watson <rwatson@freebsd.org>
X-Sender: robert@fledge.watson.org
To: Iasen Kostov <tbyte@OTEL.net>
In-Reply-To: <41B6DE57.4030909@OTEL.net>
Message-ID: <Pine.NEB.3.96L.1041208105902.98791A-100000@fledge.watson.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: freebsd-net@freebsd.org
Subject: Re: em(4) VLAN + PROMISC still doesn't work with latest CVS version
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Dec 2004 11:06:48 -0000


On Wed, 8 Dec 2004, Iasen Kostov wrote:

> The patch generates .rej against this version:
> 
> /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.44.2.4 2004/11/23 22:28:40 
> rwatson Exp $*/
<snip> 
> should I use the version from -CURRENT or it is possible (adjusted 
> patch) to work with this one ?

Odd.  I successfully applied the patch against RELENG_5 here before
sending it out, and against the same revision.  Could you try deleting
if_em, re-updating, and re-applying?  The change to remove the busdma map
deletion is needed because in the patched version, those failures occur
before the mapping is allocated.  There was a revision of if_em after
initial attempts to fix the problem that didn't properly free the
mappings, but I think it was the .3 revision in RELENG_5.  One might
expect the new patch to reject against that older revision because the
deletions had not yet been inserted (so to speak).

Robert N M Watson             FreeBSD Core Team, TrustedBSD Projects
robert@fledge.watson.org      Principal Research Scientist, McAfee Research