From owner-svn-src-head@FreeBSD.ORG  Thu Jul 30 17:40:48 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F0BA1065670;
	Thu, 30 Jul 2009 17:40:48 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DA378FC15;
	Thu, 30 Jul 2009 17:40:48 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6UHem00029159;
	Thu, 30 Jul 2009 17:40:48 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6UHemYb029157;
	Thu, 30 Jul 2009 17:40:48 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200907301740.n6UHemYb029157@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 30 Jul 2009 17:40:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195976 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2009 17:40:48 -0000

Author: delphij
Date: Thu Jul 30 17:40:47 2009
New Revision: 195976
URL: http://svn.freebsd.org/changeset/base/195976

Log:
  Show interface name which received short CARP packet (e.g. a VRRP packet),
  in order to match other codepaths nearby.  This makes troubleshooting
  easier.
  
  Approved by:	re (kib)
  MFC after:	1 month

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Thu Jul 30 17:36:13 2009	(r195975)
+++ head/sys/netinet/ip_carp.c	Thu Jul 30 17:40:47 2009	(r195976)
@@ -572,8 +572,9 @@ carp_input(struct mbuf *m, int hlen)
 	if (m->m_pkthdr.len < iplen + sizeof(*ch)) {
 		CARPSTATS_INC(carps_badlen);
 		CARP_LOG("carp_input: received len %zd < "
-		    "sizeof(struct carp_header)\n",
-		    m->m_len - sizeof(struct ip));
+		    "sizeof(struct carp_header) on %s\n",
+		    m->m_len - sizeof(struct ip),
+		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
 		return;
 	}