carp error message diff

[Stefan Sperling]

Sync error strings between v4 and v6 carp code.

ok?

Index: ip_carp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_carp.c,v
retrieving revision 1.190
diff -u -p -r1.190 ip_carp.c
--- ip_carp.c   6 Sep 2011 16:00:22 -0000       1.190
+++ ip_carp.c   2 Oct 2011 08:50:13 -0000
@@ -586,8 +586,8 @@ carp_proto_input(struct mbuf *m, ...)
        len = iplen + sizeof(*ch);
        if (len > m->m_pkthdr.len) {
                carpstats.carps_badlen++;
-               CARP_LOG(LOG_INFO, sc, ("packet too short %d on %s", 
m->m_pkthdr.len,
-                   m->m_pkthdr.rcvif->if_xname));
+               CARP_LOG(LOG_INFO, sc, ("packet size %d too small on %s",
+                   m->m_pkthdr.len, m->m_pkthdr.rcvif->if_xname));
                m_freem(m);
                return;
        }
@@ -621,7 +621,8 @@ carp6_proto_input(struct mbuf **mp, int 
        struct carp_softc *sc = NULL;
        struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
        struct carp_header *ch;
-       u_int len;
+       int len;
+       char *if_xname;
 
        carpstats.carps_ipackets6++;
 
@@ -649,11 +650,13 @@ carp6_proto_input(struct mbuf **mp, int 
        }
 
        /* verify that we have a complete carp packet */
-       len = m->m_len;
+       len = m->m_pkthdr.len;
+       if_xname = m->m_pkthdr.rcvif->if_xname;
        IP6_EXTHDR_GET(ch, struct carp_header *, m, *offp, sizeof(*ch));
        if (ch == NULL) {
                carpstats.carps_badlen++;
-               CARP_LOG(LOG_INFO, sc, ("packet size %u too small", len));
+               CARP_LOG(LOG_INFO, sc, ("packet size %d too small on %s",
+                   len, if_xname)); 
                return (IPPROTO_DONE);
        }
 
@@ -662,7 +665,7 @@ carp6_proto_input(struct mbuf **mp, int 
        m->m_data += *offp;
        if (carp_cksum(m, sizeof(*ch))) {
                carpstats.carps_badsum++;
-               CARP_LOG(LOG_INFO, sc, ("checksum failed, on %s",
+               CARP_LOG(LOG_INFO, sc, ("checksum failed on %s",
                    m->m_pkthdr.rcvif->if_xname));
                m_freem(m);
                return (IPPROTO_DONE);