From 964dbca2f361f99f23fe73f482142c8cdc28f790 Mon Sep 17 00:00:00 2001
From: sam <sam@FreeBSD.org>
Date: Tue, 7 Oct 2008 19:42:56 +0000
Subject: [PATCH] the 3945 firmware license does not require acknowledging the
 EULA, remove the sysctl ack requirement

Pointed out by:	Joerg Sonnenberger
Reviewed by:	thompsa
Approved by:	core
---
 share/man/man4/wpi.4       | 19 ++-----------------
 sys/modules/wpifw/Makefile |  1 -
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 1f9b2f58fcb1..4a827b377011 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Apri 13, 2008
+.Dd October 5, 2008
 .Os
 .Dt WPI 4
 .Sh NAME
@@ -51,13 +51,6 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_wpi_load="YES"
 .Ed
-.Pp
-In both cases, place the following line in
-.Xr loader.conf 5
-to acknowledge the firmware license (see below):
-.Bd -literal -offset indent
-legal.intel_wpi.license_ack=1
-.Ed
 .Sh DESCRIPTION
 The
 .Nm
@@ -78,12 +71,6 @@ For more information on configuring this device, see
 This driver requires the firmware built with the
 .Nm wpifw
 module to work.
-For the loaded firmware to be enabled for use the license at
-.Pa /usr/share/doc/legal/intel_iwi/LICENSE
-must be agreed by adding the following line to
-.Xr loader.conf 5 :
-.Pp
-.Dl "legal.intel_wpi.license_ack=1"
 .Sh FILES
 .Bl -tag -width ".Pa /usr/share/doc/legal/intel_wpi/LICENSE" -compact
 .It Pa /usr/share/doc/legal/intel_wpi/LICENSE
@@ -122,9 +109,7 @@ The driver failed to load the firmware image using the
 subsystem.
 Verify the 
 .Xr wpifw
-firmware module is installed and the license agreement
-.Xr loader 8
-tunable has been set.
+firmware module is installed.
 .It "wpi%d: fatal firmware error"
 An unknown error has occurred in the uploaded firmware, you may have to
 unload/reload the driver to continue.
diff --git a/sys/modules/wpifw/Makefile b/sys/modules/wpifw/Makefile
index 77fc98d983df..aae1972dcc2d 100644
--- a/sys/modules/wpifw/Makefile
+++ b/sys/modules/wpifw/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	wpifw
 FIRMWS=	iwlwifi-3945-2.14.4.fw:wpifw:2144
-FIRMWARE_LICENSE= intel_wpi
 
 CLEANFILES=	iwlwifi-3945-2.14.4.fw