--- a/usr/src/cmd/cmd-inet/usr.lib/wpa_supplicant/THIRDPARTYLICENSE	Tue May 28 10:51:43 2013 +0200
+++ b/usr/src/cmd/cmd-inet/usr.lib/wpa_supplicant/THIRDPARTYLICENSE	Wed May 29 08:25:52 2013 +0200
@@ -1,49 +1,22 @@
-wpa_supplicant
+wpa_supplicant and hostapd
 --------------------------
 
 Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
-These programs are licensed under the BSD license (the one with
-advertisement clause removed).
 
-Sun elects to license this software under the BSD license.
-
-License
--------
-
-This software may be distributed, used, and modified under the terms of
-BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+See the README file for the current license terms.
 
-3. Neither the name(s) of the above-listed copyright holder(s) nor the
-   names of its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
+This software was previously distributed under BSD/GPL v2 dual license
+terms that allowed either of those license alternatives to be
+selected. As of February 11, 2012, the project has chosen to use only
+the BSD license option for future distribution. As such, the GPL v2
+license option is no longer used. It should be noted that the BSD
+license option (the one with advertisement clause removed) is compatible
+with GPL and as such, does not prevent use of this software in projects
+that use GPL.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
- * Copyright (c) 2004, Sam Leffler <sam@errno.com>
- * Sun elects to license this software under the BSD license.
- * See wpa_supplicant/README for more details.
- */
+Some of the files may still include pointers to GPL version 2 license
+terms. However, such copyright and license notifications are maintained
+only for attribution purposes and any distribution of this software
+after February 11, 2012 is no longer under the GPL v2 option.

--- a/usr/src/lib/libdladm/common/libdlwlan.c	Tue May 28 10:51:43 2013 +0200
+++ b/usr/src/lib/libdladm/common/libdlwlan.c	Wed May 29 08:25:52 2013 +0200
@@ -376,8 +376,6 @@
 	return (status);
 }
 
-
-
 dladm_status_t
 dladm_wlan_connect(dladm_handle_t handle, datalink_id_t linkid,
     dladm_wlan_attr_t *attrp, const void *key, void *eap_attr)
@@ -588,8 +586,8 @@
 
 		if ((state = smf_get_state(WPA_SUPPLICANT_SVC)) == NULL) {
 			if (isatty(fileno(stdout)))
-				(void) printf("use :'pkg install "
-				    "pkg:/service/network/wpa_supplicant'\n");
+				(void) printf("Install 'wpa_supplicant' "
+				    "package!\n");
 			return (DLADM_STATUS_NOTFOUND);
 		}