cvs commit: src/sys/modules/if_bridge Makefile src/sys/net if_bridge.c

[Andrew Thompson]

thompsa     2006-06-23 01:14:57 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/modules/if_bridge Makefile 
    sys/net              if_bridge.c 
  Log:
  MFC: Makefile r1.5; if_bridge.c r1.62
  
   Allow bridge and carp to play nicely together by returning the packet if its
   destined for a carp interface.
  
  Revision   Changes    Path
  1.2.2.2    +1 -1      src/sys/modules/if_bridge/Makefile
  1.11.2.33  +16 -2     src/sys/net/if_bridge.c