From owner-svn-src-head@FreeBSD.ORG  Sat Sep 22 19:03:12 2012
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 2776A106564A;
	Sat, 22 Sep 2012 19:03:12 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 13BED8FC12;
	Sat, 22 Sep 2012 19:03:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8MJ3BL6022254;
	Sat, 22 Sep 2012 19:03:11 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MJ3BuC022250;
	Sat, 22 Sep 2012 19:03:11 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201209221903.q8MJ3BuC022250@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 22 Sep 2012 19:03:11 +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: r240836 - head/sys/netpfil/pf
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: Sat, 22 Sep 2012 19:03:12 -0000

Author: glebius
Date: Sat Sep 22 19:03:11 2012
New Revision: 240836
URL: http://svn.freebsd.org/changeset/base/240836

Log:
  EBUSY is a better reply for refusing to unload pf(4) or pfsync(4).
  
  Submitted by:	pluknet

Modified:
  head/sys/netpfil/pf/if_pfsync.c
  head/sys/netpfil/pf/pf_ioctl.c

Modified: head/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- head/sys/netpfil/pf/if_pfsync.c	Sat Sep 22 18:47:14 2012	(r240835)
+++ head/sys/netpfil/pf/if_pfsync.c	Sat Sep 22 19:03:11 2012	(r240836)
@@ -2371,7 +2371,7 @@ pfsync_modevent(module_t mod, int type, 
 		/*
 		 * Module should not be unloaded due to race conditions.
 		 */
-		error = EPERM;
+		error = EBUSY;
 		break;
 	case MOD_UNLOAD:
 		pfsync_uninit();

Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c	Sat Sep 22 18:47:14 2012	(r240835)
+++ head/sys/netpfil/pf/pf_ioctl.c	Sat Sep 22 19:03:11 2012	(r240836)
@@ -3756,7 +3756,7 @@ pf_modevent(module_t mod, int type, void
 		/*
 		 * Module should not be unloaded due to race conditions.
 		 */
-		error = EPERM;
+		error = EBUSY;
 		break;
 	case MOD_UNLOAD:
 		error = pf_unload();