cvs commit: src/sys/netinet6 ipsec.c

Sat Apr 1 15:16:15 UTC 2006

rwatson     2006-04-01 15:16:14 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet6         ipsec.c 
  Log:
  Merge ipsec.c:1.44 from HEAD to RELENG_6:
  
    Remove manual assignment of m_pkthdr from one mbuf to another in
    ipsec_copypkt(), as this is already handled by the call to
    M_MOVE_PKTHDR(), which also knows how to correctly handle MAC m_tags.
    This corrects a panic when running with MAC and KAME IPSEC.
  
    PR:             kern/94599
    Submitted by:   zhouyi zhou <zhouyi04 at ios dot cn>
    Reviewed by:    bz, gnn
  
  Approved by:    re (mux)
  
  Revision  Changes    Path
  1.42.2.2  +0 -9      src/sys/netinet6/ipsec.c