From owner-freebsd-net@FreeBSD.ORG Wed Dec 8 11:42:18 2004 Return-Path: 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 2621716A4CE; Wed, 8 Dec 2004 11:42:18 +0000 (GMT) Received: from BASE.OTEL.net (BASE.OTEL.net [212.36.8.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id C804A43D53; Wed, 8 Dec 2004 11:42:17 +0000 (GMT) (envelope-from tbyte@OTEL.net) Received: from dragon.otel.net ([212.36.8.135]) by BASE.OTEL.net with esmtp (Exim 4.30; FreeBSD) id 1Cc0D2-0008Lg-MX; Wed, 08 Dec 2004 13:42:16 +0200 Message-ID: <41B6E8B3.8090009@OTEL.net> Date: Wed, 08 Dec 2004 13:42:43 +0200 From: Iasen Kostov User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.3) Gecko/20041117 X-Accept-Language: bg, en-us, en MIME-Version: 1.0 To: Robert Watson References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2004 11:42:18 -0000 Robert Watson wrote: >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 $*/ >> >> > > > >>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). > > #:> ls -l if_em.c -rw-r--r-- 1 root wheel 109829 Nov 24 00:28 if_em.c root@DraGoN:/usr/src/sys/dev/em on ttypf #:> patch < if_em.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: if_em.c |=================================================================== |RCS file: /home/ncvs/src/sys/dev/em/if_em.c,v |retrieving revision 1.54 |diff -u -r1.54 if_em.c |--- if_em.c 14 Nov 2004 20:20:28 -0000 1.54 |+++ if_em.c 8 Dec 2004 10:30:03 -0000 -------------------------- Patching file if_em.c using Plan A... Hunk #1 succeeded at 1220 (offset 17 lines). Hunk #2 failed at 1243. Hunk #3 succeeded at 1266 with fuzz 2 (offset 17 lines). 1 out of 3 hunks failed--saving rejects to if_em.c.rej done #:> ident if_em.c if_em.c: $FreeBSD: src/sys/dev/em/if_em.c,v 1.44.2.4 2004/11/23 22:28:40 rwatson Exp $ I've deleted the whole dir and cvsuped. Does 1.54 differs much from 1.44.2.4 ?