On 2010/06/16 18:36, Patrick Coleman wrote:
quoted text
>  	/*
>  	 * If packet is unicast and we're in promiscuous mode, make sure it
>  	 * is for us.  Drop otherwise.
> +	 *
> +	 * Check ifp and ifp_orig, to catch promiscuous members of a
> +	 * non-promiscuous trunk.
>  	 */
>  	if ((m->m_flags & (M_BCAST|M_MCAST)) == 0 &&
> -	    (ifp->if_flags & IFF_PROMISC)) {
> +	    ((ifp->if_flags & IFF_PROMISC) ||
> +	    (ifp_orig->if_flags & IFF_PROMISC))) {
> +
>  		if (bcmp(ac->ac_enaddr, (caddr_t)eh->ether_dhost,
>  		    ETHER_ADDR_LEN)) {
>  			m_freem(m);
> 

trunk(4) places trunkports into promiscuous mode anyway,
so would it make more sense just to skip the IFF_PROMISC
check here? in which case, there would be no need to
preserve ifp_orig.

quoted text
> +		 * Has been set to the trunk interface. ifp_orig preserves the physical

it's not mentioned explicitly in style(9) but wrapping to
80 columns is preferred.