On Wed, Jun 16, 2010 at 10:17 AM, Patrick Coleman <blinken@gmail.com> wrote:

quoted text
> Index: if_ethersubr.c
> ===================================================================
> RCS file: /cvs/src/sys/net/if_ethersubr.c,v
> retrieving revision 1.139
> diff if_ethersubr.c
> 540a541
>>       struct ifnet *ifp_orig = ifp0;
> 568c569,570
> <               /* Has been set to the trunk interface */
> ---
>>               /* Has been set to the trunk interface. ifp_orig preserves
the
quoted text
> physical
>>                * input interface. */
> 685a688,690
>>        *
>>        * Check ifp and ifp_orig, to catch promiscuous members of a
>>        * non-promiscuous trunk.
> 688c693,695
> <           (ifp->if_flags & IFF_PROMISC)) {
> ---
>>           ((ifp->if_flags & IFF_PROMISC) ||
>>                (ifp_orig->if_flags & IFF_PROMISC))) {
>
>

diff -u is preferred. Can you resend it in unified format?