em(4) VLAN + PROMISC still doesn't work with latest CVS version

[Iasen Kostov]

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 $*/
>>    
>>
><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).
>  
>
#:> ls -l if_em.c
-rw-r--r--  1 root  wheel  109829 Nov 24 00:28 if_em.c

root at 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 ?