svn commit: r236297 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Wed May 30 07:11:27 2012
New Revision: 236297
URL: http://svn.freebsd.org/changeset/base/236297

Log:
  After r228571 carp_output() expects carp_softc * pointer in the mtag.
  
  Noticed by:	thompsa

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Wed May 30 06:53:09 2012	(r236296)
+++ head/sys/netinet/ip_carp.c	Wed May 30 07:11:27 2012	(r236297)
@@ -1061,13 +1061,13 @@ carp_macmatch6(struct ifnet *ifp, struct
 			IF_ADDR_RUNLOCK(ifp);
 
 			mtag = m_tag_get(PACKET_TAG_CARP,
-			    sizeof(struct ifnet *), M_NOWAIT);
+			    sizeof(struct carp_softc *), M_NOWAIT);
 			if (mtag == NULL)
 				/* Better a bit than nothing. */
 				return (LLADDR(&sc->sc_addr));
 
-			bcopy(&ifp, (caddr_t)(mtag + 1),
-			    sizeof(struct ifnet *));
+			bcopy(&sc, (caddr_t)(mtag + 1),
+			    sizeof(struct carp_softc *));
 			m_tag_prepend(m, mtag);
 
 			return (LLADDR(&sc->sc_addr));