cvs commit: src/sys/net ethernet.h if_bridge.c if_ethersubr.c if_vlan.c

[Andrew Thompson]

thompsa     2007-10-28 16:24:16 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/net              ethernet.h if_bridge.c if_ethersubr.c 
                         if_vlan.c 
  Log:
  MFC ethernet.h r.133, if_bridge.c r1.104, if_ethersubr.c r1.237, if_vlan.c r1.125
  
    The bridging output function puts the mbuf directly on the interfaces send
    queue so the output network card must support the same tagging mechanism as
    how the frame was input (prepended Ethernet header tag or stripped HW mflag).
  
    Now the vlan Ethernet header is _always_ stripped in ether_input and the mbuf
    flagged, only only network cards with VLAN_HWTAGGING enabled would properly
    re-tag any outgoing vlan frames.
  
    If the outgoing interface does not support hardware tagging then readd the vlan
    header to the front of the frame. Move the common vlan encapsulation in to
    ether_vlanencap().
  
  Approved by:    re (kensmith)
  
  Revision   Changes    Path
  1.32.2.1   +1 -0      src/sys/net/ethernet.h
  1.103.2.2  +17 -1     src/sys/net/if_bridge.c
  1.236.2.1  +28 -0     src/sys/net/if_ethersubr.c
  1.124.2.1  +1 -28     src/sys/net/if_vlan.c