From owner-svn-src-head@FreeBSD.ORG  Fri Jan 23 14:28:13 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A2C004D0;
 Fri, 23 Jan 2015 14:28:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F70CC4A;
 Fri, 23 Jan 2015 14:28:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NESDju004472;
 Fri, 23 Jan 2015 14:28:13 GMT (envelope-from will@FreeBSD.org)
Received: (from will@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NESDMl004471;
 Fri, 23 Jan 2015 14:28:13 GMT (envelope-from will@FreeBSD.org)
Message-Id: <201501231428.t0NESDMl004471@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: will set sender to will@FreeBSD.org
 using -f
From: Will Andrews <will@FreeBSD.org>
Date: Fri, 23 Jan 2015 14:28:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277563 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 23 Jan 2015 14:28:13 -0000

Author: will
Date: Fri Jan 23 14:28:12 2015
New Revision: 277563
URL: https://svnweb.freebsd.org/changeset/base/277563

Log:
  When a CARP state change is caused by an ifconfig request, log it accordingly.
  
  Suggested by:	glebius
  MFC after:	1 week
  MFC with:	277530

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Fri Jan 23 13:26:35 2015	(r277562)
+++ head/sys/netinet/ip_carp.c	Fri Jan 23 14:28:12 2015	(r277563)
@@ -1702,12 +1702,14 @@ carp_ioctl(struct ifreq *ifr, u_long cmd
 			switch (carpr.carpr_state) {
 			case BACKUP:
 				callout_stop(&sc->sc_ad_tmo);
-				carp_set_state(sc, BACKUP, "SIOCSVH");
+				carp_set_state(sc, BACKUP,
+				    "user requested via ifconfig");
 				carp_setrun(sc, 0);
 				carp_delroute(sc);
 				break;
 			case MASTER:
-				carp_master_down_locked(sc, "SIOCSVH");
+				carp_master_down_locked(sc,
+				    "user requested via ifconfig");
 				break;
 			default:
 				break;