From owner-svn-src-stable-7@FreeBSD.ORG Sun Apr 3 03:44:48 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E93C41065676; Sun, 3 Apr 2011 03:44:48 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D89EB8FC0C; Sun, 3 Apr 2011 03:44:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p333im1v001572; Sun, 3 Apr 2011 03:44:48 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p333imQB001566; Sun, 3 Apr 2011 03:44:48 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201104030344.p333imQB001566@svn.freebsd.org> From: Edwin Groothuis Date: Sun, 3 Apr 2011 03:44:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220288 - stable/7/share/zoneinfo X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2011 03:44:49 -0000 Author: edwin Date: Sun Apr 3 03:44:48 2011 New Revision: 220288 URL: http://svn.freebsd.org/changeset/base/220288 Log: MFC of 220286, tzdata2011e: Change for Africa/Casablanca: - The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00 - The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00 Update for SouthAmerica/Chili: - Chile's clocks will go back an hour this year on the 7th of May instead of this Saturday. They will go forward again the 3rd Saturday in August, not in October as they have since 1968. This is a pilot plan which will be reevaluated in 2012. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/europe stable/7/share/zoneinfo/southamerica stable/7/share/zoneinfo/zone.tab Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa ============================================================================== --- stable/7/share/zoneinfo/africa Sun Apr 3 03:43:47 2011 (r220287) +++ stable/7/share/zoneinfo/africa Sun Apr 3 03:44:48 2011 (r220288) @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.28
+# @(#)africa	8.30
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -712,6 +712,48 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
 # 
 
+# From Dan Abitol (2011-03-30):
+# ...Rules for Africa/Casablanca are the following (24h format)
+# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+# The 31th july 2011 at 00:59:59,  [it] will be 31th July 00:00:00
+# ...Official links of change in morocco
+# The change was broadcast on the FM Radio
+# I ve called ANRT (telecom regulations in Morocco) at
+# +212.537.71.84.00
+# 
+# http://www.anrt.net.ma/fr/
+# 
+# They said that
+# 
+# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
+# 
+# is the official publication to look at.
+# They said that the decision was already taken.
+#
+# More articles in the press
+# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
+# 
+# e.html
+# 
+# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
+# 
+# 
+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
+# anche-prochain-5538.html
+# 
+
+# From Petr Machata (2011-03-30):
+# They have it written in English here:
+# 
+# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
+# 
+#
+# It says there that "Morocco will resume its standard time on July 31,
+# 2011 at midnight." Now they don't say whether they mean midnight of
+# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
+# also been like that in the past.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -735,6 +777,8 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
 Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
 Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16

Modified: stable/7/share/zoneinfo/asia
==============================================================================
--- stable/7/share/zoneinfo/asia	Sun Apr  3 03:43:47 2011	(r220287)
+++ stable/7/share/zoneinfo/asia	Sun Apr  3 03:44:48 2011	(r220288)
@@ -1,4 +1,4 @@
-# @(#)asia	8.62
+# @(#)asia	8.64
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/7/share/zoneinfo/europe
==============================================================================
--- stable/7/share/zoneinfo/europe	Sun Apr  3 03:43:47 2011	(r220287)
+++ stable/7/share/zoneinfo/europe	Sun Apr  3 03:44:48 2011	(r220288)
@@ -1,5 +1,5 @@
 # 
-# @(#)europe	8.28
+# @(#)europe	8.31
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Sun Apr  3 03:43:47 2011	(r220287)
+++ stable/7/share/zoneinfo/southamerica	Sun Apr  3 03:44:48 2011	(r220288)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.45
+# @(#)southamerica	8.47
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1171,6 +1171,19 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1
 # From Arthur David Olson (2011-03-02):
 # The emol.com article mentions a water shortage as the cause of the
 # postponement, which may mean that it's not a permanent change.
+
+# From Glenn Eychaner (2011-03-28):
+# The article:
+# 
+# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+# 
+#
+# In English:
+# Chile's clocks will go back an hour this year on the 7th of May instead
+# of this Saturday. They will go forward again the 3rd Saturday in
+# August, not in October as they have since 1968. This is a pilot plan
+# which will be reevaluated in 2012.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1200,13 +1213,16 @@ Rule	Chile	1997	only	-	Mar	30	3:00u	0	-
 Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
 Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.

Modified: stable/7/share/zoneinfo/zone.tab
==============================================================================
--- stable/7/share/zoneinfo/zone.tab	Sun Apr  3 03:43:47 2011	(r220287)
+++ stable/7/share/zoneinfo/zone.tab	Sun Apr  3 03:44:48 2011	(r220288)
@@ -1,5 +1,5 @@
 # 
-# @(#)zone.tab	8.41
+# @(#)zone.tab	8.43
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr  4 09:38:05 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B016106564A;
	Mon,  4 Apr 2011 09:38:05 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 46E9E8FC1F;
	Mon,  4 Apr 2011 09:38:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p349c5Oj077998;
	Mon, 4 Apr 2011 09:38:05 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p349c5lQ077996;
	Mon, 4 Apr 2011 09:38:05 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201104040938.p349c5lQ077996@svn.freebsd.org>
From: Sergey Kandaurov 
Date: Mon, 4 Apr 2011 09:38:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220321 - stable/7/lib/libc/gen
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 04 Apr 2011 09:38:05 -0000

Author: pluknet
Date: Mon Apr  4 09:38:05 2011
New Revision: 220321
URL: http://svn.freebsd.org/changeset/base/220321

Log:
  MFC r220157:
  
  Use FD_CLOEXEC explicitly.

Modified:
  stable/7/lib/libc/gen/syslog.c
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/gen/syslog.c
==============================================================================
--- stable/7/lib/libc/gen/syslog.c	Mon Apr  4 09:36:29 2011	(r220320)
+++ stable/7/lib/libc/gen/syslog.c	Mon Apr  4 09:38:05 2011	(r220321)
@@ -342,7 +342,7 @@ connectlog(void)
 	if (LogFile == -1) {
 		if ((LogFile = _socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
 			return;
-		(void)_fcntl(LogFile, F_SETFD, 1);
+		(void)_fcntl(LogFile, F_SETFD, FD_CLOEXEC);
 	}
 	if (LogFile != -1 && status == NOCONN) {
 		SyslogAddr.sun_len = sizeof(SyslogAddr);

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr  4 14:57:29 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D1BC1065677;
	Mon,  4 Apr 2011 14:57:29 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BFF38FC0A;
	Mon,  4 Apr 2011 14:57:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34EvTq4086777;
	Mon, 4 Apr 2011 14:57:29 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34EvTNC086775;
	Mon, 4 Apr 2011 14:57:29 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201104041457.p34EvTNC086775@svn.freebsd.org>
From: Hajimu UMEMOTO 
Date: Mon, 4 Apr 2011 14:57:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220327 - stable/7/usr.bin/su
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 04 Apr 2011 14:57:29 -0000

Author: ume
Date: Mon Apr  4 14:57:28 2011
New Revision: 220327
URL: http://svn.freebsd.org/changeset/base/220327

Log:
  MFC r220055: getlogin() may return NULL.

Modified:
  stable/7/usr.bin/su/su.c
Directory Properties:
  stable/7/usr.bin/su/   (props changed)

Modified: stable/7/usr.bin/su/su.c
==============================================================================
--- stable/7/usr.bin/su/su.c	Mon Apr  4 14:54:52 2011	(r220326)
+++ stable/7/usr.bin/su/su.c	Mon Apr  4 14:57:28 2011	(r220327)
@@ -153,7 +153,7 @@ int
 main(int argc, char *argv[])
 {
 	static char	*cleanenv;
-	struct passwd	*pwd;
+	struct passwd	*pwd = NULL;
 	struct pam_conv	conv = { openpam_ttyconv, NULL };
 	enum tristate	iscsh;
 	login_cap_t	*lc;
@@ -258,8 +258,9 @@ main(int argc, char *argv[])
 	/* get current login name, real uid and shell */
 	ruid = getuid();
 	username = getlogin();
-	pwd = getpwnam(username);
-	if (username == NULL || pwd == NULL || pwd->pw_uid != ruid)
+	if (username != NULL)
+		pwd = getpwnam(username);
+	if (pwd == NULL || pwd->pw_uid != ruid)
 		pwd = getpwuid(ruid);
 	if (pwd == NULL) {
 #ifdef USE_BSM_AUDIT

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr  4 20:02:30 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C70B1065672;
	Mon,  4 Apr 2011 20:02:30 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 497628FC29;
	Mon,  4 Apr 2011 20:02:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34K2UwA094150;
	Mon, 4 Apr 2011 20:02:30 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34K2UKL094143;
	Mon, 4 Apr 2011 20:02:30 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201104042002.p34K2UKL094143@svn.freebsd.org>
From: Navdeep Parhar 
Date: Mon, 4 Apr 2011 20:02:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220341 - in stable/7/sys/dev/cxgb: . common
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 04 Apr 2011 20:02:30 -0000

Author: np
Date: Mon Apr  4 20:02:29 2011
New Revision: 220341
URL: http://svn.freebsd.org/changeset/base/220341

Log:
  MFC r219945, r219946, r220009
  
  r219945:
  T3C initialization should setup the parity fence too.
  
  r219946:
  t3_free_sge_resources should be given the number of qsets it needs to free.
  
  r220009:
  Update T3 firmware to 7.11.0

Modified:
  stable/7/sys/dev/cxgb/common/cxgb_common.h
  stable/7/sys/dev/cxgb/common/cxgb_t3_hw.c
  stable/7/sys/dev/cxgb/cxgb_adapter.h
  stable/7/sys/dev/cxgb/cxgb_main.c
  stable/7/sys/dev/cxgb/cxgb_sge.c
  stable/7/sys/dev/cxgb/cxgb_t3fw.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/cxgb/common/cxgb_common.h
==============================================================================
--- stable/7/sys/dev/cxgb/common/cxgb_common.h	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/common/cxgb_common.h	Mon Apr  4 20:02:29 2011	(r220341)
@@ -100,7 +100,7 @@ enum {
 
 enum {
 	FW_VERSION_MAJOR = 7,
-	FW_VERSION_MINOR = 8,
+	FW_VERSION_MINOR = 11,
 	FW_VERSION_MICRO = 0
 };
 

Modified: stable/7/sys/dev/cxgb/common/cxgb_t3_hw.c
==============================================================================
--- stable/7/sys/dev/cxgb/common/cxgb_t3_hw.c	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/common/cxgb_t3_hw.c	Mon Apr  4 20:02:29 2011	(r220341)
@@ -1755,6 +1755,7 @@ static int t3_handle_intr_status(adapter
 				 acts->msg, status & acts->mask);
 			CTR2(KTR_CXGB, "%s (0x%x)\n",
 				 acts->msg, status & acts->mask);
+			status &= ~acts->mask;
 		} else if (acts->msg)
 			CH_WARN(adapter, "%s (0x%x)\n",
 				acts->msg, status & acts->mask);
@@ -2194,11 +2195,10 @@ static int mac_intr_handler(adapter_t *a
 		t3_os_link_intr(pi);
 	}
 
-	t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause);
-
 	if (cause & XGM_INTR_FATAL)
 		t3_fatal_err(adap);
 
+	t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause);
 	return cause != 0;
 }
 
@@ -4198,6 +4198,7 @@ int t3_init_hw(adapter_t *adapter, u32 f
 	t3_write_reg(adapter, A_PM1_TX_MODE, 0);
 	chan_init_hw(adapter, adapter->params.chan_map);
 	t3_sge_init(adapter, &adapter->params.sge);
+	t3_set_reg_field(adapter, A_PL_RST, 0, F_FATALPERREN);
 
 	t3_write_reg(adapter, A_T3DBG_GPIO_ACT_LOW, calc_gpio_intr(adapter));
 

Modified: stable/7/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_adapter.h	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/cxgb_adapter.h	Mon Apr  4 20:02:29 2011	(r220341)
@@ -523,7 +523,7 @@ int t3_sge_alloc(struct adapter *);
 int t3_sge_free(struct adapter *);
 int t3_sge_alloc_qset(adapter_t *, uint32_t, int, int, const struct qset_params *,
     int, struct port_info *);
-void t3_free_sge_resources(adapter_t *);
+void t3_free_sge_resources(adapter_t *, int);
 void t3_sge_start(adapter_t *);
 void t3_sge_stop(adapter_t *);
 void t3b_intr(void *data);

Modified: stable/7/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_main.c	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/cxgb_main.c	Mon Apr  4 20:02:29 2011	(r220341)
@@ -739,7 +739,7 @@ cxgb_controller_detach(device_t dev)
 static void
 cxgb_free(struct adapter *sc)
 {
-	int i;
+	int i, nqsets = 0;
 
 	ADAPTER_LOCK(sc);
 	sc->flags |= CXGB_SHUTDOWN;
@@ -756,6 +756,7 @@ cxgb_free(struct adapter *sc)
 		if (sc->portdev[i] &&
 		    device_delete_child(sc->dev, sc->portdev[i]) != 0)
 			device_printf(sc->dev, "failed to delete child port\n");
+		nqsets += sc->port[i].nqsets;
 	}
 
 	/*
@@ -781,7 +782,7 @@ cxgb_free(struct adapter *sc)
 	 * sysctls are cleaned up by the kernel linker.
 	 */
 	if (sc->flags & FULL_INIT_DONE) {
- 		t3_free_sge_resources(sc);
+ 		t3_free_sge_resources(sc, nqsets);
  		sc->flags &= ~FULL_INIT_DONE;
  	}
 
@@ -870,9 +871,9 @@ setup_sge_qsets(adapter_t *sc)
 			    (sc->flags & USING_MSIX) ? qset_idx + 1 : irq_idx,
 			    &sc->params.sge.qset[qset_idx], ntxq, pi);
 			if (err) {
-				t3_free_sge_resources(sc);
-				device_printf(sc->dev, "t3_sge_alloc_qset failed with %d\n",
-				    err);
+				t3_free_sge_resources(sc, qset_idx);
+				device_printf(sc->dev,
+				    "t3_sge_alloc_qset failed with %d\n", err);
 				return (err);
 			}
 		}

Modified: stable/7/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_sge.c	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/cxgb_sge.c	Mon Apr  4 20:02:29 2011	(r220341)
@@ -1779,15 +1779,9 @@ t3_free_qset(adapter_t *sc, struct sge_q
  *	Frees resources used by the SGE queue sets.
  */
 void
-t3_free_sge_resources(adapter_t *sc)
+t3_free_sge_resources(adapter_t *sc, int nqsets)
 {
-	int i, nqsets;
-	
-#ifdef IFNET_MULTIQUEUE
-	panic("%s should not be called when IFNET_MULTIQUEUE is defined", __FUNCTION__);
-#endif		
-	for (nqsets = i = 0; i < (sc)->params.nports; i++) 
-		nqsets += sc->port[i].nqsets;
+	int i;
 
 	for (i = 0; i < nqsets; ++i)
 		t3_free_qset(sc, &sc->sge.qs[i]);

Modified: stable/7/sys/dev/cxgb/cxgb_t3fw.h
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_t3fw.h	Mon Apr  4 20:01:09 2011	(r220340)
+++ stable/7/sys/dev/cxgb/cxgb_t3fw.h	Mon Apr  4 20:02:29 2011	(r220341)
@@ -32,8 +32,8 @@ $FreeBSD$
 
 #define U (unsigned char)
 
-static unsigned int t3fw_length = 30840;
-static unsigned char t3fw[30840] = {
+static unsigned int t3fw_length = 30976;
+static unsigned char t3fw[30976] = {
 	U 0x60, U 0x00, U 0x74, U 0x00, 
 	U 0x20, U 0x03, U 0x80, U 0x00, 
 	U 0x20, U 0x03, U 0x70, U 0x00, 
@@ -55,14 +55,14 @@ static unsigned char t3fw[30840] = {
 	U 0x1F, U 0xFF, U 0xC0, U 0x00, 
 	U 0xE3, U 0x00, U 0x04, U 0x3C, 
 	U 0x02, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x6C, U 0x34, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x90, 
-	U 0x20, U 0x00, U 0x6C, U 0x7C, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x94, 
-	U 0x20, U 0x00, U 0x6C, U 0xBC, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x98, 
-	U 0x20, U 0x00, U 0x6D, U 0x30, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x9C, 
+	U 0x20, U 0x00, U 0x6C, U 0xB4, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xA0, 
+	U 0x20, U 0x00, U 0x6C, U 0xFC, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xA4, 
+	U 0x20, U 0x00, U 0x6D, U 0x3C, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xA8, 
+	U 0x20, U 0x00, U 0x6D, U 0xB0, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xAC, 
 	U 0x20, U 0x00, U 0x03, U 0xC0, 
 	U 0xC0, U 0x00, U 0x00, U 0xE4, 
 	U 0x31, U 0x00, U 0xEA, U 0x31, 
@@ -324,105 +324,105 @@ static unsigned char t3fw[30840] = {
 	U 0x1F, U 0xFF, U 0xC0, U 0x18, 
 	U 0xE3, U 0x00, U 0x05, U 0xE0, 
 	U 0x1F, U 0xFF, U 0xC0, U 0x18, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x90, 
+	U 0x1F, U 0xFF, U 0xC2, U 0x94, 
 	U 0xE3, U 0x00, U 0x05, U 0xE0, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x90, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x90, 
-	U 0xE3, U 0x00, U 0x08, U 0x58, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x90, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x8C, 
-	U 0xE3, U 0x00, U 0x08, U 0x58, 
+	U 0x1F, U 0xFF, U 0xC2, U 0x94, 
+	U 0x1F, U 0xFF, U 0xC2, U 0x94, 
+	U 0xE3, U 0x00, U 0x08, U 0x5C, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x9C, 
+	U 0xE3, U 0x00, U 0x08, U 0x5C, 
 	U 0x20, U 0x00, U 0x00, U 0x00, 
 	U 0x20, U 0x00, U 0x01, U 0x6A, 
-	U 0xE3, U 0x00, U 0x0B, U 0x54, 
+	U 0xE3, U 0x00, U 0x0B, U 0x58, 
 	U 0x20, U 0x00, U 0x01, U 0x80, 
 	U 0x20, U 0x00, U 0x01, U 0x80, 
-	U 0xE3, U 0x00, U 0x0C, U 0xC0, 
+	U 0xE3, U 0x00, U 0x0C, U 0xC4, 
 	U 0x20, U 0x00, U 0x02, U 0x00, 
 	U 0x20, U 0x00, U 0x02, U 0x03, 
-	U 0xE3, U 0x00, U 0x0C, U 0xC0, 
+	U 0xE3, U 0x00, U 0x0C, U 0xC4, 
 	U 0x20, U 0x00, U 0x02, U 0x1C, 
 	U 0x20, U 0x00, U 0x02, U 0x20, 
-	U 0xE3, U 0x00, U 0x0C, U 0xC4, 
+	U 0xE3, U 0x00, U 0x0C, U 0xC8, 
 	U 0x20, U 0x00, U 0x02, U 0x20, 
 	U 0x20, U 0x00, U 0x02, U 0x26, 
-	U 0xE3, U 0x00, U 0x0C, U 0xC8, 
+	U 0xE3, U 0x00, U 0x0C, U 0xCC, 
 	U 0x20, U 0x00, U 0x02, U 0x3C, 
 	U 0x20, U 0x00, U 0x02, U 0x40, 
-	U 0xE3, U 0x00, U 0x0C, U 0xD0, 
+	U 0xE3, U 0x00, U 0x0C, U 0xD4, 
 	U 0x20, U 0x00, U 0x02, U 0x40, 
 	U 0x20, U 0x00, U 0x02, U 0x49, 
-	U 0xE3, U 0x00, U 0x0C, U 0xD4, 
+	U 0xE3, U 0x00, U 0x0C, U 0xD8, 
 	U 0x20, U 0x00, U 0x02, U 0x4C, 
 	U 0x20, U 0x00, U 0x02, U 0x50, 
-	U 0xE3, U 0x00, U 0x0C, U 0xE0, 
+	U 0xE3, U 0x00, U 0x0C, U 0xE4, 
 	U 0x20, U 0x00, U 0x02, U 0x50, 
 	U 0x20, U 0x00, U 0x02, U 0x59, 
-	U 0xE3, U 0x00, U 0x0C, U 0xE4, 
+	U 0xE3, U 0x00, U 0x0C, U 0xE8, 
 	U 0x20, U 0x00, U 0x02, U 0x5C, 
 	U 0x20, U 0x00, U 0x02, U 0x60, 
-	U 0xE3, U 0x00, U 0x0C, U 0xF0, 
+	U 0xE3, U 0x00, U 0x0C, U 0xF4, 
 	U 0x20, U 0x00, U 0x02, U 0x60, 
 	U 0x20, U 0x00, U 0x02, U 0x69, 
-	U 0xE3, U 0x00, U 0x0C, U 0xF4, 
+	U 0xE3, U 0x00, U 0x0C, U 0xF8, 
 	U 0x20, U 0x00, U 0x02, U 0x6C, 
 	U 0x20, U 0x00, U 0x02, U 0x70, 
-	U 0xE3, U 0x00, U 0x0D, U 0x00, 
+	U 0xE3, U 0x00, U 0x0D, U 0x04, 
 	U 0x20, U 0x00, U 0x02, U 0x70, 
 	U 0x20, U 0x00, U 0x02, U 0x79, 
-	U 0xE3, U 0x00, U 0x0D, U 0x04, 
+	U 0xE3, U 0x00, U 0x0D, U 0x08, 
 	U 0x20, U 0x00, U 0x02, U 0x8C, 
 	U 0x20, U 0x00, U 0x02, U 0x8C, 
-	U 0xE3, U 0x00, U 0x0D, U 0x10, 
+	U 0xE3, U 0x00, U 0x0D, U 0x14, 
 	U 0x20, U 0x00, U 0x02, U 0x90, 
 	U 0x20, U 0x00, U 0x02, U 0x93, 
-	U 0xE3, U 0x00, U 0x0D, U 0x10, 
+	U 0xE3, U 0x00, U 0x0D, U 0x14, 
 	U 0x20, U 0x00, U 0x02, U 0xAC, 
 	U 0x20, U 0x00, U 0x02, U 0xB0, 
-	U 0xE3, U 0x00, U 0x0D, U 0x14, 
+	U 0xE3, U 0x00, U 0x0D, U 0x18, 
 	U 0x20, U 0x00, U 0x02, U 0xD0, 
 	U 0x20, U 0x00, U 0x02, U 0xF2, 
-	U 0xE3, U 0x00, U 0x0D, U 0x18, 
+	U 0xE3, U 0x00, U 0x0D, U 0x1C, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
-	U 0xE3, U 0x00, U 0x0D, U 0x3C, 
+	U 0xE3, U 0x00, U 0x0D, U 0x40, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
-	U 0xE3, U 0x00, U 0x0D, U 0x3C, 
+	U 0xE3, U 0x00, U 0x0D, U 0x40, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
-	U 0xE3, U 0x00, U 0x0D, U 0x3C, 
+	U 0xE3, U 0x00, U 0x0D, U 0x40, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
-	U 0xE3, U 0x00, U 0x0D, U 0x3C, 
+	U 0xE3, U 0x00, U 0x0D, U 0x40, 
 	U 0x20, U 0x00, U 0x03, U 0xB0, 
-	U 0x20, U 0x00, U 0x6E, U 0x54, 
-	U 0xE3, U 0x00, U 0x0D, U 0x3C, 
-	U 0x20, U 0x00, U 0x6E, U 0x54, 
-	U 0x20, U 0x00, U 0x6E, U 0x54, 
-	U 0xE3, U 0x00, U 0x77, U 0xE0, 
+	U 0x20, U 0x00, U 0x6E, U 0xD4, 
+	U 0xE3, U 0x00, U 0x0D, U 0x40, 
+	U 0x20, U 0x00, U 0x6E, U 0xD4, 
+	U 0x20, U 0x00, U 0x6E, U 0xD4, 
+	U 0xE3, U 0x00, U 0x78, U 0x64, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x1F, U 0xFC, U 0x00, U 0x00, 
 	U 0x1F, U 0xFC, U 0x00, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x90, 
-	U 0x1F, U 0xFF, U 0xC6, U 0x70, 
-	U 0x20, U 0x00, U 0x6E, U 0x58, 
-	U 0x20, U 0x00, U 0x6E, U 0x58, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC6, U 0x90, 
+	U 0x20, U 0x00, U 0x6E, U 0xD8, 
+	U 0x20, U 0x00, U 0x6E, U 0xD8, 
 	U 0xDE, U 0xFF, U 0xFE, U 0x00, 
 	U 0x00, U 0x00, U 0x08, U 0x0C, 
 	U 0xDE, U 0xAD, U 0xBE, U 0xEF, 
-	U 0x1F, U 0xFF, U 0xC2, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC2, U 0xB0, 
 	U 0x1F, U 0xFC, U 0xFE, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC0, U 0x94, 
-	U 0x1F, U 0xFF, U 0xC5, U 0xC0, 
+	U 0x1F, U 0xFF, U 0xC0, U 0xA4, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xD0, 
 	U 0x30, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x3F, U 0xFF, U 0xFF, 
 	U 0x80, U 0x40, U 0x00, U 0x00, 
 	U 0x10, U 0x00, U 0x00, U 0x00, 
 	U 0x08, U 0x0F, U 0xFF, U 0xFF, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x6D, 
+	U 0x1F, U 0xFF, U 0xC2, U 0x7D, 
 	U 0x00, U 0x0F, U 0xFF, U 0xFF, 
 	U 0x80, U 0x4F, U 0xFF, U 0xFF, 
 	U 0x80, U 0x00, U 0x00, U 0x00, 
@@ -431,6 +431,9 @@ static unsigned char t3fw[30840] = {
 	U 0x60, U 0x50, U 0x00, U 0x00, 
 	U 0x60, U 0x00, U 0x00, U 0x00, 
 	U 0x40, U 0x00, U 0x00, U 0x11, 
+	U 0x20, U 0x30, U 0x00, U 0x00, 
+	U 0x00, U 0x00, U 0xFF, U 0xFF, 
+	U 0x00, U 0x00, U 0x0B, U 0x20, 
 	U 0x35, U 0x00, U 0x00, U 0x00, 
 	U 0x41, U 0x00, U 0x00, U 0x00, 
 	U 0x10, U 0x00, U 0x00, U 0x01, 
@@ -441,6 +444,7 @@ static unsigned char t3fw[30840] = {
 	U 0x80, U 0x00, U 0x00, U 0x19, 
 	U 0x04, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x08, U 0x00, 
+	U 0xE1, U 0x00, U 0x02, U 0x00, 
 	U 0x10, U 0x00, U 0x00, U 0x05, 
 	U 0x80, U 0x60, U 0x00, U 0x00, 
 	U 0x70, U 0x00, U 0x00, U 0x00, 
@@ -454,8 +458,8 @@ static unsigned char t3fw[30840] = {
 	U 0x18, U 0x00, U 0x00, U 0x00, 
 	U 0x01, U 0x00, U 0x80, U 0x01, 
 	U 0x42, U 0x00, U 0x00, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC2, U 0x1D, 
-	U 0x1F, U 0xFF, U 0xC0, U 0xDC, 
+	U 0x1F, U 0xFF, U 0xC2, U 0x2D, 
+	U 0x1F, U 0xFF, U 0xC0, U 0xEC, 
 	U 0x00, U 0x01, U 0x00, U 0x80, 
 	U 0x60, U 0x40, U 0x00, U 0x00, 
 	U 0x1A, U 0x00, U 0x00, U 0x00, 
@@ -472,49 +476,49 @@ static unsigned char t3fw[30840] = {
 	U 0x80, U 0x00, U 0x00, U 0x1A, 
 	U 0x03, U 0x00, U 0x00, U 0x00, 
 	U 0x80, U 0x00, U 0x04, U 0x00, 
+	U 0x04, U 0x03, U 0x04, U 0x03, 
 	U 0x50, U 0x00, U 0x00, U 0x03, 
 	U 0xFF, U 0xFF, U 0xBF, U 0xFF, 
-	U 0x1F, U 0xFF, U 0xC3, U 0xD4, 
+	U 0x1F, U 0xFF, U 0xC3, U 0xE4, 
 	U 0x00, U 0x00, U 0x0F, U 0xFF, 
 	U 0xFF, U 0xFF, U 0xF0, U 0x00, 
 	U 0x00, U 0x00, U 0x16, U 0xD0, 
 	U 0x00, U 0x00, U 0xFF, U 0xF7, 
 	U 0xA5, U 0x00, U 0x00, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC4, U 0xB0, 
-	U 0x1F, U 0xFF, U 0xC4, U 0x61, 
+	U 0x1F, U 0xFF, U 0xC4, U 0xC0, 
+	U 0x1F, U 0xFF, U 0xC4, U 0x71, 
 	U 0x00, U 0x01, U 0x00, U 0x08, 
-	U 0x00, U 0x00, U 0x0B, U 0x20, 
 	U 0x20, U 0x2F, U 0xFF, U 0x80, 
-	U 0x1F, U 0xFF, U 0xC4, U 0x55, 
+	U 0x1F, U 0xFF, U 0xC4, U 0x65, 
 	U 0x00, U 0x00, U 0x2C, U 0x00, 
 	U 0xFF, U 0xFE, U 0xFF, U 0xF8, 
 	U 0x00, U 0xFF, U 0xFF, U 0xFF, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x78, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x88, 
 	U 0x00, U 0x00, U 0x20, U 0x00, 
 	U 0xFF, U 0xFF, U 0xDF, U 0xFF, 
 	U 0x00, U 0x00, U 0xFF, U 0xEF, 
 	U 0x01, U 0x00, U 0x11, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC3, U 0xD2, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x90, 
+	U 0x1F, U 0xFF, U 0xC3, U 0xE2, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xA0, 
 	U 0xFF, U 0xFF, U 0xEF, U 0xFF, 
 	U 0x00, U 0x00, U 0xFF, U 0xFB, 
-	U 0x1F, U 0xFF, U 0xC6, U 0x30, 
-	U 0x1F, U 0xFF, U 0xBE, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC6, U 0x50, 
+	U 0x1F, U 0xFF, U 0xBE, U 0xB0, 
 	U 0xFF, U 0xFF, U 0xF7, U 0xFF, 
-	U 0x1F, U 0xFF, U 0xC0, U 0x64, 
+	U 0x1F, U 0xFF, U 0xC0, U 0x74, 
 	U 0x00, U 0x00, U 0xFF, U 0xFD, 
-	U 0x1F, U 0xFF, U 0xC6, U 0x20, 
+	U 0x1F, U 0xFF, U 0xC6, U 0x40, 
 	U 0x00, U 0x01, U 0xFB, U 0xD0, 
-	U 0x1F, U 0xFF, U 0xC5, U 0xB0, 
-	U 0x1F, U 0xFF, U 0xC6, U 0x60, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x91, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xC0, 
+	U 0x1F, U 0xFF, U 0xC6, U 0x80, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xA1, 
 	U 0xE0, U 0xFF, U 0xFE, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC5, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xB0, 
 	U 0x00, U 0x00, U 0x80, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x3C, 
-	U 0x1F, U 0xFF, U 0xC5, U 0xB4, 
-	U 0x1F, U 0xFF, U 0xC0, U 0x68, 
-	U 0x1F, U 0xFF, U 0xC4, U 0xD0, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x4C, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xC4, 
+	U 0x1F, U 0xFF, U 0xC0, U 0x78, 
+	U 0x1F, U 0xFF, U 0xC4, U 0xE4, 
 	U 0x1F, U 0xFC, U 0xFF, U 0xD8, 
 	U 0x00, U 0x01, U 0x00, U 0x81, 
 	U 0x7F, U 0xFF, U 0xFF, U 0xFF, 
@@ -522,21 +526,19 @@ static unsigned char t3fw[30840] = {
 	U 0x00, U 0x00, U 0x27, U 0x10, 
 	U 0x1F, U 0xFC, U 0xFE, U 0x30, 
 	U 0x1F, U 0xFC, U 0xFE, U 0x70, 
-	U 0xE1, U 0x00, U 0x02, U 0x00, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x38, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x50, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x48, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x60, 
 	U 0x00, U 0x03, U 0xD0, U 0x90, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x64, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x74, 
 	U 0x2B, U 0x50, U 0x63, U 0x80, 
 	U 0x2B, U 0x50, U 0x79, U 0x80, 
 	U 0x2B, U 0x50, U 0x90, U 0x80, 
 	U 0x2B, U 0x50, U 0xA6, U 0x80, 
-	U 0x1F, U 0xFF, U 0xC4, U 0x69, 
+	U 0x1F, U 0xFF, U 0xC4, U 0x79, 
 	U 0x01, U 0x00, U 0x11, U 0x0F, 
 	U 0x20, U 0x2F, U 0xFE, U 0x00, 
 	U 0x20, U 0x30, U 0x00, U 0x80, 
 	U 0x20, U 0x2F, U 0xFF, U 0x00, 
-	U 0x00, U 0x00, U 0xFF, U 0xFF, 
 	U 0x00, U 0x01, U 0xFF, U 0xF8, 
 	U 0x2B, U 0x50, U 0xB2, U 0x00, 
 	U 0x2B, U 0x50, U 0xB2, U 0x08, 
@@ -548,24 +550,23 @@ static unsigned char t3fw[30840] = {
 	U 0x2B, U 0x50, U 0xBD, U 0x28, 
 	U 0x2B, U 0x50, U 0xBC, U 0x80, 
 	U 0x2B, U 0x50, U 0xBD, U 0xA0, 
-	U 0x20, U 0x30, U 0x00, U 0x00, 
 	U 0xDF, U 0xFF, U 0xFE, U 0x00, 
 	U 0x50, U 0x00, U 0x00, U 0x02, 
 	U 0x00, U 0xC0, U 0x00, U 0x00, 
 	U 0x02, U 0x00, U 0x00, U 0x00, 
 	U 0xFF, U 0xFF, U 0xF7, U 0xF4, 
-	U 0x1F, U 0xFF, U 0xC0, U 0x6C, 
+	U 0x1F, U 0xFF, U 0xC0, U 0x7C, 
 	U 0x00, U 0x0F, U 0xF8, U 0x00, 
 	U 0x04, U 0x40, U 0x00, U 0x00, 
 	U 0x00, U 0x10, U 0x00, U 0x00, 
 	U 0x0C, U 0x40, U 0x00, U 0x00, 
 	U 0x1C, U 0x40, U 0x00, U 0x00, 
 	U 0xE0, U 0x00, U 0x00, U 0xA0, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x40, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x50, 
 	U 0x1F, U 0xFD, U 0x00, U 0x08, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x54, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x68, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x7C, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x64, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x78, 
+	U 0x1F, U 0xFF, U 0xC5, U 0x8C, 
 	U 0xE1, U 0x00, U 0x06, U 0x90, 
 	U 0xE1, U 0x00, U 0x06, U 0xEC, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
@@ -616,70 +617,70 @@ static unsigned char t3fw[30840] = {
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x55, U 0x54, 
-	U 0x20, U 0x00, U 0x54, U 0x24, 
-	U 0x20, U 0x00, U 0x55, U 0x54, 
-	U 0x20, U 0x00, U 0x55, U 0x54, 
-	U 0x20, U 0x00, U 0x53, U 0x60, 
-	U 0x20, U 0x00, U 0x53, U 0x60, 
-	U 0x20, U 0x00, U 0x53, U 0x60, 
-	U 0x20, U 0x00, U 0x51, U 0xA0, 
-	U 0x20, U 0x00, U 0x51, U 0xA0, 
-	U 0x20, U 0x00, U 0x51, U 0x98, 
-	U 0x20, U 0x00, U 0x51, U 0x04, 
-	U 0x20, U 0x00, U 0x4F, U 0xAC, 
-	U 0x20, U 0x00, U 0x4D, U 0x8C, 
-	U 0x20, U 0x00, U 0x4B, U 0x60, 
-	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x55, U 0x24, 
-	U 0x20, U 0x00, U 0x53, U 0xF0, 
-	U 0x20, U 0x00, U 0x54, U 0x94, 
-	U 0x20, U 0x00, U 0x54, U 0x94, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x51, U 0x90, 
-	U 0x20, U 0x00, U 0x52, U 0x48, 
-	U 0x20, U 0x00, U 0x4E, U 0xCC, 
-	U 0x20, U 0x00, U 0x4D, U 0x3C, 
-	U 0x20, U 0x00, U 0x4B, U 0x0C, 
+	U 0x20, U 0x00, U 0x56, U 0x20, 
+	U 0x20, U 0x00, U 0x54, U 0xF0, 
+	U 0x20, U 0x00, U 0x56, U 0x20, 
+	U 0x20, U 0x00, U 0x56, U 0x20, 
+	U 0x20, U 0x00, U 0x54, U 0x2C, 
+	U 0x20, U 0x00, U 0x54, U 0x2C, 
+	U 0x20, U 0x00, U 0x54, U 0x2C, 
+	U 0x20, U 0x00, U 0x52, U 0x6C, 
+	U 0x20, U 0x00, U 0x52, U 0x6C, 
+	U 0x20, U 0x00, U 0x52, U 0x64, 
+	U 0x20, U 0x00, U 0x51, U 0xD0, 
+	U 0x20, U 0x00, U 0x50, U 0x78, 
+	U 0x20, U 0x00, U 0x4E, U 0x58, 
+	U 0x20, U 0x00, U 0x4C, U 0x2C, 
+	U 0x00, U 0x00, U 0x00, U 0x00, 
+	U 0x00, U 0x00, U 0x00, U 0x00, 
+	U 0x20, U 0x00, U 0x55, U 0xF0, 
+	U 0x20, U 0x00, U 0x54, U 0xBC, 
+	U 0x20, U 0x00, U 0x55, U 0x60, 
+	U 0x20, U 0x00, U 0x55, U 0x60, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x52, U 0x5C, 
+	U 0x20, U 0x00, U 0x53, U 0x14, 
+	U 0x20, U 0x00, U 0x4F, U 0x98, 
+	U 0x20, U 0x00, U 0x4E, U 0x08, 
+	U 0x20, U 0x00, U 0x4B, U 0xD8, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x0B, U 0xE8, 
-	U 0x20, U 0x00, U 0x3A, U 0xA8, 
+	U 0x20, U 0x00, U 0x0B, U 0xF0, 
+	U 0x20, U 0x00, U 0x3B, U 0x74, 
 	U 0x20, U 0x00, U 0x04, U 0xC0, 
-	U 0x20, U 0x00, U 0x46, U 0xFC, 
-	U 0x20, U 0x00, U 0x0B, U 0xE0, 
-	U 0x20, U 0x00, U 0x41, U 0xC0, 
+	U 0x20, U 0x00, U 0x47, U 0xC8, 
+	U 0x20, U 0x00, U 0x0B, U 0xE8, 
+	U 0x20, U 0x00, U 0x42, U 0x8C, 
 	U 0x20, U 0x00, U 0x03, U 0xF0, 
-	U 0x20, U 0x00, U 0x46, U 0xBC, 
-	U 0x20, U 0x00, U 0x4A, U 0xE8, 
-	U 0x20, U 0x00, U 0x3E, U 0xCC, 
-	U 0x20, U 0x00, U 0x3D, U 0xE8, 
-	U 0x20, U 0x00, U 0x3A, U 0x24, 
-	U 0x20, U 0x00, U 0x38, U 0xB4, 
-	U 0x20, U 0x00, U 0x36, U 0x24, 
-	U 0x20, U 0x00, U 0x31, U 0x84, 
-	U 0x20, U 0x00, U 0x3C, U 0x44, 
-	U 0x20, U 0x00, U 0x2D, U 0xB0, 
-	U 0x20, U 0x00, U 0x28, U 0x44, 
-	U 0x20, U 0x00, U 0x67, U 0xD8, 
-	U 0x20, U 0x00, U 0x23, U 0xD0, 
-	U 0x20, U 0x00, U 0x20, U 0xB0, 
-	U 0x20, U 0x00, U 0x20, U 0x5C, 
-	U 0x20, U 0x00, U 0x1D, U 0x48, 
-	U 0x20, U 0x00, U 0x18, U 0x40, 
-	U 0x20, U 0x00, U 0x15, U 0x68, 
-	U 0x20, U 0x00, U 0x0E, U 0x4C, 
-	U 0x20, U 0x00, U 0x0C, U 0x2C, 
-	U 0x20, U 0x00, U 0x11, U 0x2C, 
-	U 0x20, U 0x00, U 0x13, U 0x18, 
-	U 0x20, U 0x00, U 0x43, U 0xB8, 
-	U 0x20, U 0x00, U 0x3E, U 0x80, 
-	U 0x20, U 0x00, U 0x0B, U 0xF0, 
+	U 0x20, U 0x00, U 0x47, U 0x88, 
+	U 0x20, U 0x00, U 0x4B, U 0xB4, 
+	U 0x20, U 0x00, U 0x3F, U 0x98, 
+	U 0x20, U 0x00, U 0x3E, U 0xB4, 
+	U 0x20, U 0x00, U 0x3A, U 0xF0, 
+	U 0x20, U 0x00, U 0x39, U 0x80, 
+	U 0x20, U 0x00, U 0x36, U 0xF0, 
+	U 0x20, U 0x00, U 0x32, U 0x50, 
+	U 0x20, U 0x00, U 0x3D, U 0x10, 
+	U 0x20, U 0x00, U 0x2E, U 0x68, 
+	U 0x20, U 0x00, U 0x28, U 0xFC, 
+	U 0x20, U 0x00, U 0x68, U 0x58, 
+	U 0x20, U 0x00, U 0x24, U 0x88, 
+	U 0x20, U 0x00, U 0x21, U 0x68, 
+	U 0x20, U 0x00, U 0x21, U 0x14, 
+	U 0x20, U 0x00, U 0x1E, U 0x00, 
+	U 0x20, U 0x00, U 0x18, U 0xF8, 
+	U 0x20, U 0x00, U 0x16, U 0x20, 
+	U 0x20, U 0x00, U 0x0E, U 0xD4, 
+	U 0x20, U 0x00, U 0x0C, U 0x34, 
+	U 0x20, U 0x00, U 0x11, U 0xCC, 
+	U 0x20, U 0x00, U 0x13, U 0xB8, 
+	U 0x20, U 0x00, U 0x44, U 0x84, 
+	U 0x20, U 0x00, U 0x3F, U 0x4C, 
+	U 0x20, U 0x00, U 0x0B, U 0xF8, 
 	U 0x20, U 0x00, U 0x04, U 0xC0, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
@@ -851,22 +852,22 @@ static unsigned char t3fw[30840] = {
 	U 0x0B, U 0xBB, U 0x90, U 0x00, 
 	U 0x53, U 0x00, U 0x00, U 0x00, 
 	U 0x63, U 0xFF, U 0xFC, U 0x00, 
-	U 0x20, U 0x00, U 0x6C, U 0x10, 
+	U 0x20, U 0x00, U 0x6C, U 0x90, 
 	U 0x10, U 0xFF, U 0xFF, U 0x0A, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x6C, U 0x34, 
+	U 0x20, U 0x00, U 0x6C, U 0xB4, 
 	U 0x00, U 0xD2, U 0x31, U 0x10, 
 	U 0xFF, U 0xFE, U 0x0A, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x6C, U 0x7C, 
+	U 0x20, U 0x00, U 0x6C, U 0xFC, 
 	U 0x00, U 0xD3, U 0x31, U 0x10, 
 	U 0xFF, U 0xFE, U 0x0A, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x6C, U 0xBC, 
+	U 0x20, U 0x00, U 0x6D, U 0x3C, 
 	U 0x00, U 0xD4, U 0x31, U 0x10, 
 	U 0xFF, U 0xFE, U 0x0A, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
-	U 0x20, U 0x00, U 0x6D, U 0x30, 
+	U 0x20, U 0x00, U 0x6D, U 0xB0, 
 	U 0x00, U 0xD5, U 0x31, U 0x10, 
 	U 0xFF, U 0xFE, U 0x0A, U 0x00, 
 	U 0x00, U 0x00, U 0x00, U 0x00, 
@@ -883,8 +884,8 @@ static unsigned char t3fw[30840] = {
 	U 0xFF, U 0xFC, U 0x00, U 0x00, 
 	U 0x1F, U 0xFF, U 0xD0, U 0x00, 
 	U 0x00, U 0x04, U 0x00, U 0x20, 
-	U 0x1F, U 0xFF, U 0xC5, U 0x90, 
-	U 0x1F, U 0xFF, U 0xC6, U 0x70, 
+	U 0x1F, U 0xFF, U 0xC5, U 0xA0, 
+	U 0x1F, U 0xFF, U 0xC6, U 0x90, 
 	U 0x20, U 0x0A, U 0x00, U 0x11, 
 	U 0xFF, U 0xFB, U 0x13, U 0xFF, 
 	U 0xFB, U 0x03, U 0xE6, U 0x31, 
@@ -893,8 +894,8 @@ static unsigned char t3fw[30840] = {
 	U 0xFA, U 0xD3, U 0x0F, U 0x77, 
 	U 0x6B, U 0x06, U 0x90, U 0x60, 
 	U 0xB4, U 0x66, U 0x77, U 0x63, 
-	U 0xF8, U 0x54, U 0x15, U 0xE6, 
-	U 0x54, U 0x1A, U 0x91, U 0x0F, 
+	U 0xF8, U 0x54, U 0x16, U 0x19, 
+	U 0x54, U 0x1A, U 0xB1, U 0x0F, 
 	U 0x14, U 0x00, U 0x63, U 0xFF, 
 	U 0xF9, U 0x00, U 0x00, U 0x00, 
 	U 0x6C, U 0x10, U 0x04, U 0xC0, 
@@ -954,43 +955,45 @@ static unsigned char t3fw[30840] = {
 	U 0xC1, U 0xE8, U 0xC1, U 0xC7, 
 	U 0x2B, U 0x22, U 0x1E, U 0x28, 
 	U 0x22, U 0x1D, U 0xC0, U 0xD0, 
-	U 0x7B, U 0x81, U 0x31, U 0x29, 
+	U 0x7B, U 0x81, U 0x35, U 0x29, 
 	U 0x20, U 0x06, U 0x0B, U 0xB7, 
 	U 0x02, U 0x29, U 0x9C, U 0xFA, 
 	U 0x65, U 0x50, U 0x08, U 0x28, 
 	U 0x20, U 0x72, U 0x28, U 0x8C, 
 	U 0xFF, U 0x28, U 0x24, U 0x72, 
-	U 0x64, U 0x91, U 0x5C, U 0x2A, 
+	U 0x64, U 0x91, U 0x64, U 0x2A, 
 	U 0xB0, U 0x00, U 0x0C, U 0xA8, 
-	U 0x0C, U 0x64, U 0x81, U 0x67, 
+	U 0x0C, U 0x64, U 0x81, U 0x6F, 
 	U 0x0E, U 0xA9, U 0x0C, U 0x64, 
-	U 0x92, U 0xB3, U 0x7F, U 0xA1, 
-	U 0x37, U 0x69, U 0xAC, U 0x2F, 
-	U 0x60, U 0x00, U 0x34, U 0x00, 
-	U 0x00, U 0x28, U 0x20, U 0x06, 
-	U 0xD7, U 0xD0, U 0x28, U 0x8C, 
-	U 0xFA, U 0xCC, U 0x57, U 0x2A, 
-	U 0x20, U 0x72, U 0x2A, U 0xAC, 
-	U 0xFF, U 0x2A, U 0x24, U 0x72, 
-	U 0x64, U 0x81, U 0x35, U 0x2A, 
-	U 0xD0, U 0x00, U 0x0C, U 0xA9, 
-	U 0x0C, U 0x64, U 0x91, U 0x64, 
-	U 0x0E, U 0xAC, U 0x0C, U 0x64, 
-	U 0xC3, U 0x1B, U 0x7F, U 0xA1, 
-	U 0x07, U 0x68, U 0xAC, U 0x07, 
-	U 0xC0, U 0x20, U 0xD1, U 0x0F, 
-	U 0x00, U 0x2D, U 0x25, U 0x02, 
+	U 0x92, U 0xBB, U 0x7F, U 0xA1, 
+	U 0x3F, U 0xC1, U 0xCE, U 0x7C, 
+	U 0xA1, U 0x36, U 0x69, U 0xAC, 
+	U 0x33, U 0x60, U 0x00, U 0x37, 
+	U 0x00, U 0x29, U 0x20, U 0x06, 
+	U 0xD7, U 0xD0, U 0x29, U 0x9C, 
+	U 0xFA, U 0xCC, U 0x57, U 0x28, 
+	U 0x20, U 0x72, U 0x28, U 0x8C, 
+	U 0xFF, U 0x28, U 0x24, U 0x72, 
+	U 0x64, U 0x91, U 0x39, U 0x2A, 
+	U 0xD0, U 0x00, U 0x0C, U 0xA8, 
+	U 0x0C, U 0x64, U 0x81, U 0x68, 
+	U 0x0E, U 0xA9, U 0x0C, U 0x64, 
+	U 0x93, U 0x1F, U 0x7F, U 0xA1, 
+	U 0x0B, U 0xC1, U 0xCE, U 0x7C, 
+	U 0xA1, U 0x02, U 0x68, U 0xAC, 
+	U 0x06, U 0xC0, U 0x20, U 0xD1, 
+	U 0x0F, U 0x2D, U 0x25, U 0x02, 
 	U 0x8A, U 0x32, U 0xC0, U 0x90, 
 	U 0x0A, U 0x6E, U 0x50, U 0x65, 
 	U 0xE5, U 0xB5, U 0x29, U 0x24, 
 	U 0x67, U 0x09, U 0x0F, U 0x47, 
 	U 0x65, U 0xF5, U 0xB1, U 0x2C, 
 	U 0x20, U 0x0C, U 0x1F, U 0xEE, 
-	U 0xB5, U 0x0C, U 0xCE, U 0x11, 
+	U 0xB3, U 0x0C, U 0xCE, U 0x11, 
 	U 0xAF, U 0xEE, U 0x29, U 0xE2, 
 	U 0x86, U 0xB4, U 0x48, U 0x79, 
 	U 0x83, U 0x02, U 0x60, U 0x05, 
-	U 0x82, U 0x19, U 0xEE, U 0xB1, 
+	U 0x82, U 0x19, U 0xEE, U 0xAF, 
 	U 0x09, U 0xC9, U 0x0A, U 0x29, 
 	U 0x92, U 0xA3, U 0x68, U 0x90, 
 	U 0x07, U 0x8F, U 0x20, U 0x09, 
@@ -1002,16 +1005,16 @@ static unsigned char t3fw[30840] = {
 	U 0xD9, U 0xB0, U 0x60, U 0x00, 
 	U 0x02, U 0x00, U 0xC0, U 0x90, 
 	U 0x8B, U 0x94, U 0x17, U 0xEE, 
-	U 0xA7, U 0x0B, U 0x88, U 0x14, 
+	U 0xA5, U 0x0B, U 0x88, U 0x14, 
 	U 0x87, U 0x74, U 0x0B, U 0x0B, 
 	U 0x47, U 0xA8, U 0x77, U 0x18, 
-	U 0xEE, U 0xA5, U 0x09, U 0xBB, 
+	U 0xEE, U 0xA3, U 0x09, U 0xBB, 
 	U 0x10, U 0x08, U 0x77, U 0x02, 
 	U 0x97, U 0xF0, U 0x18, U 0xEE, 
-	U 0xA3, U 0x17, U 0xEE, U 0xA4, 
+	U 0xA1, U 0x17, U 0xEE, U 0xA2, 
 	U 0x08, U 0xA8, U 0x01, U 0x0B, 
 	U 0x88, U 0x02, U 0x07, U 0x47, 
-	U 0x02, U 0x1B, U 0xEE, U 0xA0, 
+	U 0x02, U 0x1B, U 0xEE, U 0x9E, 
 	U 0x97, U 0xF1, U 0x0B, U 0x88, 
 	U 0x02, U 0x98, U 0xF2, U 0x27, 
 	U 0x90, U 0x23, U 0x2B, U 0x90, 
@@ -1022,7 +1025,7 @@ static unsigned char t3fw[30840] = {
 	U 0x07, U 0x77, U 0x10, U 0x0C, 
 	U 0x88, U 0x10, U 0x07, U 0x88, 
 	U 0x02, U 0x0B, U 0x88, U 0x02, 
-	U 0x17, U 0xEE, U 0x98, U 0x8B, 
+	U 0x17, U 0xEE, U 0x96, U 0x8B, 
 	U 0x33, U 0x07, U 0xBB, U 0x01, 
 	U 0x87, U 0x34, U 0x0B, U 0x88, 
 	U 0x02, U 0x98, U 0xF3, U 0x97, 
@@ -1030,9 +1033,9 @@ static unsigned char t3fw[30840] = {
 	U 0x95, U 0x87, U 0x39, U 0x9B, 
 	U 0xF5, U 0x88, U 0x96, U 0x8B, 
 	U 0x38, U 0x98, U 0xF6, U 0x88, 
-	U 0x97, U 0x97, U 0xF9, U 0x9B, 
-	U 0xF8, U 0x98, U 0xF7, U 0x17, 
-	U 0xEE, U 0x8F, U 0x28, U 0xE2, 
+	U 0x97, U 0x9B, U 0xF8, U 0x97, 
+	U 0xF9, U 0x98, U 0xF7, U 0x17, 
+	U 0xEE, U 0x8D, U 0x28, U 0xE2, 
 	U 0x85, U 0x07, U 0xC7, U 0x08, 
 	U 0x2D, U 0x74, U 0xCF, U 0x08, 
 	U 0x48, U 0x0B, U 0x28, U 0xE6, 
@@ -1040,18 +1043,18 @@ static unsigned char t3fw[30840] = {
 	U 0x2B, U 0x22, U 0x1E, U 0x28, 
 	U 0x22, U 0x1D, U 0x7B, U 0x89, 
 	U 0x02, U 0x2B, U 0x0A, U 0x00, 
-	U 0x64, U 0xBF, U 0x04, U 0x2C, 
+	U 0x64, U 0xBF, U 0x05, U 0x2C, 
 	U 0xB0, U 0x07, U 0x28, U 0xB0, 
 	U 0x00, U 0xDA, U 0x20, U 0x06, 
 	U 0x88, U 0x0A, U 0x28, U 0x82, 
 	U 0x4C, U 0xC0, U 0xD1, U 0x0B, 
 	U 0x80, U 0x00, U 0xDB, U 0xA0, 
 	U 0x65, U 0xAF, U 0xE7, U 0x63, 
-	U 0xFE, U 0xE9, U 0x00, U 0x00, 
+	U 0xFE, U 0xEA, U 0x00, U 0x00, 
 	U 0x29, U 0x20, U 0x72, U 0x65, 
-	U 0x9E, U 0x9C, U 0x60, U 0x04, 
+	U 0x9E, U 0x94, U 0x60, U 0x04, 
 	U 0xE7, U 0x2A, U 0x20, U 0x72, 
-	U 0x65, U 0xAE, U 0xC3, U 0x60, 
+	U 0x65, U 0xAE, U 0xBF, U 0x60, 
 	U 0x04, U 0xDE, U 0x00, U 0x00, 
 	U 0x2E, U 0xB0, U 0x03, U 0x2C, 
 	U 0x20, U 0x67, U 0xD4, U 0xE0, 
@@ -1060,7 +1063,7 @@ static unsigned char t3fw[30840] = {
 	U 0xFF, U 0x50, U 0x0C, U 0x45, 
 	U 0x54, U 0xBC, U 0x55, U 0x64, 
 	U 0xF4, U 0xEB, U 0x19, U 0xEE, 
-	U 0x74, U 0x88, U 0x2A, U 0x09, 
+	U 0x72, U 0x88, U 0x2A, U 0x09, 
 	U 0xA9, U 0x01, U 0x09, U 0x88, 
 	U 0x0C, U 0x64, U 0x82, U 0x1F, 
 	U 0xC0, U 0x92, U 0x60, U 0x00, 
@@ -1071,7 +1074,7 @@ static unsigned char t3fw[30840] = {
 	U 0x0A, U 0xFC, U 0x50, U 0x0B, 
 	U 0x45, U 0x54, U 0xBC, U 0x55, 
 	U 0x64, U 0xC4, U 0xBE, U 0x19, 
-	U 0xEE, U 0x69, U 0x88, U 0x2A, 
+	U 0xEE, U 0x67, U 0x88, U 0x2A, 
 	U 0x09, U 0xA9, U 0x01, U 0x79, 
 	U 0x89, U 0xD5, U 0x0B, U 0xEA, 
 	U 0x50, U 0x64, U 0xA4, U 0xE3, 
@@ -1107,7 +1110,7 @@ static unsigned char t3fw[30840] = {
 	U 0xFC, U 0x13, U 0x2C, U 0x16, 
 	U 0x18, U 0x2B, U 0x12, U 0x1A, 
 	U 0x2A, U 0x12, U 0x1B, U 0xDC, 
-	U 0x50, U 0x58, U 0x19, U 0xA4, 
+	U 0x50, U 0x58, U 0x19, U 0xC2, 
 	U 0xC0, U 0xD0, U 0xC0, U 0x90, 
 	U 0x2E, U 0x5C, U 0xF4, U 0x2C, 
 	U 0x12, U 0x17, U 0x28, U 0x12, 
@@ -1124,25 +1127,25 @@ static unsigned char t3fw[30840] = {
 	U 0x03, U 0x89, U 0x75, U 0xB1, 
 	U 0xEA, U 0x2A, U 0x74, U 0x03, 
 	U 0xB0, U 0x99, U 0x09, U 0x49, 
-	U 0x0C, U 0x65, U 0x9D, U 0xB3, 
+	U 0x0C, U 0x65, U 0x9D, U 0xB4, 
 	U 0x2B, U 0x20, U 0x67, U 0x2D, 
 	U 0x25, U 0x02, U 0x65, U 0xB3, 
 	U 0xFA, U 0x2B, U 0x22, U 0x1E, 
 	U 0x2C, U 0x22, U 0x1D, U 0x7B, 
 	U 0xC9, U 0x01, U 0xC0, U 0xB0, 
-	U 0x64, U 0xBD, U 0x9C, U 0x2C, 
+	U 0x64, U 0xBD, U 0x9D, U 0x2C, 
 	U 0xB0, U 0x07, U 0x28, U 0xB0, 
 	U 0x00, U 0xDA, U 0x20, U 0x06, 
 	U 0x88, U 0x0A, U 0x28, U 0x82, 
 	U 0x4C, U 0xC0, U 0xD1, U 0x0B, 
 	U 0x80, U 0x00, U 0xDB, U 0xA0, 
 	U 0x65, U 0xAF, U 0xE7, U 0x63, 
-	U 0xFD, U 0x81, U 0x89, U 0xBA, 
+	U 0xFD, U 0x82, U 0x89, U 0xBA, 
 	U 0xB1, U 0x99, U 0x65, U 0x90, 
 	U 0x97, U 0x88, U 0x34, U 0x1C, 
-	U 0xEE, U 0x25, U 0x98, U 0xBA, 
+	U 0xEE, U 0x23, U 0x98, U 0xBA, 
 	U 0x8F, U 0x33, U 0x1E, U 0xEE, 
-	U 0x1E, U 0x0F, U 0x4F, U 0x54, 
+	U 0x1C, U 0x0F, U 0x4F, U 0x54, 
 	U 0x2F, U 0xB4, U 0x2C, U 0x8D, 
 	U 0x2A, U 0x8A, U 0x32, U 0x0E, 
 	U 0xDD, U 0x02, U 0x0C, U 0xAC, 
@@ -1180,8 +1183,8 @@ static unsigned char t3fw[30840] = {
 	U 0xC0, U 0x2C, U 0x20, U 0x67, 
 	U 0x2D, U 0x25, U 0x02, U 0x65, 
 	U 0xC3, U 0x11, U 0x1D, U 0xED, 
-	U 0xF8, U 0x8A, U 0x32, U 0x1E, 
-	U 0xED, U 0xFD, U 0x0D, U 0xAD, 
+	U 0xF6, U 0x8A, U 0x32, U 0x1E, 
+	U 0xED, U 0xFB, U 0x0D, U 0xAD, 
 	U 0x01, U 0x0E, U 0xDD, U 0x0C, 
 	U 0x65, U 0xD2, U 0x8A, U 0x0A, 
 	U 0x4E, U 0x51, U 0x6F, U 0xE2, 
@@ -1191,14 +1194,14 @@ static unsigned char t3fw[30840] = {
 	U 0x65, U 0xF2, U 0xF8, U 0x28, 
 	U 0x22, U 0x1D, U 0x7B, U 0x89, 
 	U 0x02, U 0x2B, U 0x0A, U 0x00, 
-	U 0x64, U 0xBC, U 0xA8, U 0x2C, 
+	U 0x64, U 0xBC, U 0xA9, U 0x2C, 
 	U 0xB0, U 0x07, U 0x28, U 0xB0, 
 	U 0x00, U 0xDA, U 0x20, U 0x06, 
 	U 0x88, U 0x0A, U 0x28, U 0x82, 
 	U 0x4C, U 0xC0, U 0xD1, U 0x0B, 
 	U 0x80, U 0x00, U 0xDB, U 0xA0, 
 	U 0x65, U 0xAF, U 0xE7, U 0x63, 
-	U 0xFC, U 0x8D, U 0x00, U 0x00, 
+	U 0xFC, U 0x8E, U 0x00, U 0x00, 
 	U 0x0C, U 0xE9, U 0x50, U 0x64, 
 	U 0x92, U 0xED, U 0x0C, U 0xEF, 
 	U 0x11, U 0xC0, U 0x80, U 0x28, 
@@ -1226,9 +1229,9 @@ static unsigned char t3fw[30840] = {
 	U 0xCA, U 0x2C, U 0x0A, U 0x01, 
 	U 0x64, U 0xCE, U 0x0D, U 0x60, 
 	U 0x02, U 0x8E, U 0x88, U 0x34, 
-	U 0x1B, U 0xED, U 0xCF, U 0x98, 
+	U 0x1B, U 0xED, U 0xCD, U 0x98, 
 	U 0xDA, U 0x8F, U 0x33, U 0x1E, 
-	U 0xED, U 0xC8, U 0x0F, U 0x4F, 
+	U 0xED, U 0xC6, U 0x0F, U 0x4F, 
 	U 0x54, U 0x2F, U 0xD4, U 0x2C, 
 	U 0x8C, U 0x2A, U 0x8A, U 0x32, 
 	U 0x0E, U 0xCC, U 0x02, U 0x0B, 
@@ -1345,7 +1348,7 @@ static unsigned char t3fw[30840] = {
 	U 0xFC, U 0x2A, U 0x00, U 0x00, 
 	U 0x64, U 0x50, U 0xC0, U 0xDA, 
 	U 0x20, U 0xDB, U 0xC0, U 0x58, 
-	U 0x16, U 0x78, U 0xC0, U 0x20, 
+	U 0x16, U 0x96, U 0xC0, U 0x20, 
 	U 0xD1, U 0x0F, U 0xC0, U 0x91, 
 	U 0x63, U 0xFD, U 0x7A, U 0x00, 
 	U 0xC0, U 0x91, U 0x63, U 0xFA, 
@@ -1354,15 +1357,15 @@ static unsigned char t3fw[30840] = {
 	U 0x0A, U 0x80, U 0xC0, U 0x9A, 
 	U 0x29, U 0x24, U 0x68, U 0x2C, 
 	U 0x70, U 0x07, U 0x58, U 0x15, 
-	U 0x68, U 0xD2, U 0xA0, U 0xD1, 
+	U 0x82, U 0xD2, U 0xA0, U 0xD1, 
 	U 0x0F, U 0x03, U 0x47, U 0x0B, 
-	U 0x18, U 0xED, U 0x4F, U 0xDB, 
+	U 0x18, U 0xED, U 0x4D, U 0xDB, 
 	U 0x70, U 0xA8, U 0x28, U 0x78, 
 	U 0x73, U 0x02, U 0x2B, U 0x7D, 
 	U 0xF8, U 0xD9, U 0xB0, U 0x63, 
 	U 0xFA, U 0x61, U 0x00, U 0x00, 
 	U 0x2A, U 0x2C, U 0x74, U 0xDB, 
-	U 0x40, U 0x58, U 0x0E, U 0xE3, 
+	U 0x40, U 0x58, U 0x0F, U 0x14, 
 	U 0x63, U 0xFA, U 0xE4, U 0x00, 
 	U 0x00, U 0x29, U 0x22, U 0x1D, 
 	U 0x2D, U 0x25, U 0x02, U 0x7B, 
@@ -1377,16 +1380,16 @@ static unsigned char t3fw[30840] = {
 	U 0xD1, U 0x0F, U 0xC0, U 0x91, 
 	U 0x63, U 0xFB, U 0xFF, U 0x00, 
 	U 0x02, U 0x2A, U 0x02, U 0x58, 
-	U 0x02, U 0x4C, U 0x0A, U 0xA2, 
+	U 0x02, U 0x72, U 0x0A, U 0xA2, 
 	U 0x02, U 0x06, U 0x00, U 0x00, 
 	U 0x02, U 0x2A, U 0x02, U 0x58, 
-	U 0x02, U 0x49, U 0x0A, U 0xA2, 
+	U 0x02, U 0x6F, U 0x0A, U 0xA2, 
 	U 0x02, U 0x06, U 0x00, U 0x00, 
 	U 0xDB, U 0x70, U 0xDA, U 0x20, 
 	U 0xC0, U 0xD1, U 0x2E, U 0x0A, 
 	U 0x80, U 0xC0, U 0x9E, U 0x29, 
 	U 0x24, U 0x68, U 0x2C, U 0x70, 
-	U 0x07, U 0x58, U 0x15, U 0x47, 
+	U 0x07, U 0x58, U 0x15, U 0x61, 
 	U 0xC0, U 0x20, U 0xD1, U 0x0F, 
 	U 0xC0, U 0x94, U 0x63, U 0xFB, 
 	U 0xC9, U 0xC0, U 0x96, U 0x63, 
@@ -1394,7 +1397,7 @@ static unsigned char t3fw[30840] = {
 	U 0x63, U 0xFB, U 0xBF, U 0x00, 
 	U 0x2A, U 0x2C, U 0x74, U 0xDB, 
 	U 0x30, U 0xDC, U 0x40, U 0x5B, 
-	U 0xFE, U 0x11, U 0xDB, U 0xA0, 
+	U 0xFE, U 0x0F, U 0xDB, U 0xA0, 
 	U 0xC2, U 0xA0, U 0x2A, U 0xB4, 
 	U 0x00, U 0x2C, U 0x20, U 0x0C, 
 	U 0x63, U 0xFF, U 0x27, U 0x00, 
@@ -1416,7 +1419,7 @@ static unsigned char t3fw[30840] = {
 	U 0x2A, U 0x25, U 0x02, U 0x7B, 
 	U 0x89, U 0x01, U 0xDB, U 0xA0, 
 	U 0xC9, U 0xB9, U 0x13, U 0xED, 
-	U 0x06, U 0xDA, U 0x20, U 0x28, 
+	U 0x04, U 0xDA, U 0x20, U 0x28, 
 	U 0xB0, U 0x00, U 0x2C, U 0xB0, 
 	U 0x07, U 0x03, U 0x88, U 0x0A, 
 	U 0x28, U 0x82, U 0x4C, U 0xC0, 
@@ -1428,53 +1431,54 @@ static unsigned char t3fw[30840] = {
 	U 0x20, U 0x06, U 0x2A, U 0x21, 
 	U 0x02, U 0x68, U 0xC8, U 0x05, 
 	U 0x28, U 0xCC, U 0xF9, U 0x65, 
-	U 0x81, U 0x2E, U 0x0A, U 0x09, 
-	U 0x4C, U 0x65, U 0x91, U 0x04, 
+	U 0x81, U 0x32, U 0x0A, U 0x09, 
+	U 0x4C, U 0x65, U 0x91, U 0x08, 
 	U 0x8F, U 0x30, U 0xC1, U 0xB8, 
 	U 0x0F, U 0x8F, U 0x14, U 0x7F, 
 	U 0xB0, U 0x05, U 0x28, U 0x21, 
-	U 0x23, U 0x65, U 0x81, U 0x27, 
-	U 0x16, U 0xEC, U 0xF5, U 0x29, 
+	U 0x23, U 0x65, U 0x81, U 0x2B, 
+	U 0x16, U 0xEC, U 0xF3, U 0x29, 
 	U 0x62, U 0x9E, U 0x6F, U 0x98, 
-	U 0x02, U 0x60, U 0x00, U 0xF8, 
-	U 0x19, U 0xEC, U 0xF1, U 0x29, 
+	U 0x02, U 0x60, U 0x00, U 0xFC, 
+	U 0x19, U 0xEC, U 0xEF, U 0x29, 
 	U 0x92, U 0x26, U 0x68, U 0x90, 
 	U 0x07, U 0x8A, U 0x20, U 0x09, 
 	U 0xAA, U 0x0C, U 0x65, U 0xA0, 
-	U 0xE7, U 0x2A, U 0x62, U 0x9D, 
-	U 0x64, U 0xA0, U 0xE1, U 0x2B, 
+	U 0xEB, U 0x2A, U 0x62, U 0x9D, 
+	U 0x64, U 0xA0, U 0xE5, U 0x2B, 
 	U 0x20, U 0x0C, U 0x0C, U 0xB9, 
 	U 0x11, U 0xA6, U 0x99, U 0x2D, 
 	U 0x92, U 0x86, U 0x6F, U 0xD9, 
-	U 0x02, U 0x60, U 0x00, U 0xDB, 
-	U 0x1D, U 0xEC, U 0xE9, U 0x0D, 
+	U 0x02, U 0x60, U 0x00, U 0xDF, 
+	U 0x1D, U 0xEC, U 0xE7, U 0x0D, 
 	U 0xBD, U 0x0A, U 0x2D, U 0xD2, 
 	U 0xA3, U 0x68, U 0xD0, U 0x07, 
 	U 0x8E, U 0x20, U 0x0D, U 0xEE, 
-	U 0x0C, U 0x65, U 0xE0, U 0xC7, 
+	U 0x0C, U 0x65, U 0xE0, U 0xCB, 
 	U 0x27, U 0x92, U 0x85, U 0xC0, 
-	U 0xE0, U 0x64, U 0x70, U 0xBF, 
-	U 0x1D, U 0xEC, U 0xEE, U 0x68, 
-	U 0x43, U 0x4E, U 0x1C, U 0xEC, 
-	U 0xED, U 0x8A, U 0x2B, U 0x0C, 
+	U 0xE0, U 0x64, U 0x70, U 0xC3, 
+	U 0x1D, U 0xEC, U 0xEC, U 0x68, 
+	U 0x43, U 0x52, U 0x1C, U 0xEC, 
+	U 0xEB, U 0x8A, U 0x2B, U 0x0C, 
 	U 0xAA, U 0x02, U 0x9A, U 0x70, 
 	U 0x89, U 0x20, U 0x08, U 0x99, 
 	U 0x11, U 0x0D, U 0x99, U 0x02, 
 	U 0x99, U 0x71, U 0x88, U 0x2A, 
 	U 0x98, U 0x74, U 0x8F, U 0x32, 
 	U 0x9F, U 0x75, U 0x28, U 0x21, 
-	U 0x04, U 0x08, U 0x88, U 0x11, 
-	U 0x98, U 0x77, U 0x18, U 0xEC, 
-	U 0xDE, U 0x0C, U 0xBF, U 0x11, 
-	U 0xA6, U 0xFF, U 0x2D, U 0xF2, 
-	U 0x85, U 0xA8, U 0xB8, U 0x2E, 
-	U 0x84, U 0xCF, U 0x2D, U 0xDC, 
-	U 0x28, U 0x2D, U 0xF6, U 0x85, 
-	U 0xC8, U 0x5A, U 0x2A, U 0x2C, 
-	U 0x74, U 0xDB, U 0x40, U 0x58, 
-	U 0x0E, U 0x76, U 0xD2, U 0xA0, 
-	U 0xD1, U 0x0F, U 0xC0, U 0x20, 
-	U 0xD1, U 0x0F, U 0x00, U 0x00, 
+	U 0x04, U 0x9E, U 0x76, U 0x9E, 
+	U 0x78, U 0x9E, U 0x79, U 0x08, 
+	U 0x88, U 0x11, U 0x98, U 0x77, 
+	U 0x18, U 0xEC, U 0xDB, U 0x0C, 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr  4 20:41:35 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E0077106566C;
	Mon,  4 Apr 2011 20:41:35 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE8118FC08;
	Mon,  4 Apr 2011 20:41:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34KfZvX095175;
	Mon, 4 Apr 2011 20:41:35 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34KfZOp095173;
	Mon, 4 Apr 2011 20:41:35 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201104042041.p34KfZOp095173@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Mon, 4 Apr 2011 20:41:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220343 - stable/7/sys/dev/fxp
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 04 Apr 2011 20:41:36 -0000

Author: yongari
Date: Mon Apr  4 20:41:35 2011
New Revision: 220343
URL: http://svn.freebsd.org/changeset/base/220343

Log:
  MFC r220103:
    Normally fxp(4) does not receive bad frames but promiscuous mode
    makes controller to receive bad frames and i82557 will also receive
    bad frames since fxp(4) have to receive VLAN oversized frames. If
    fxp(4) encounter DMA overrun error, the received frame size would
    be 0 so the actual frame size after checksum field extraction the
    length would be negative(-2). Due to signed/unsigned comparison
    used in driver, frame length check did not work for DMA overrun
    frames. Correct this by casting it to int.
    While I'm here explicitly check DMA overrun error and discard the
    frame regardless of result of received frame length check.
  
    Reported by:	n_hibma
    Tested by:	n_hibma

Modified:
  stable/7/sys/dev/fxp/if_fxp.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/7/sys/dev/fxp/if_fxp.c	Mon Apr  4 20:40:39 2011	(r220342)
+++ stable/7/sys/dev/fxp/if_fxp.c	Mon Apr  4 20:41:35 2011	(r220343)
@@ -1937,11 +1937,11 @@ fxp_intr_body(struct fxp_softc *sc, stru
 				/* Adjust for appended checksum bytes. */
 				total_len -= 2;
 			}
-			if (total_len < sizeof(struct ether_header) ||
+			if (total_len < (int)sizeof(struct ether_header) ||
 			    total_len > (MCLBYTES - RFA_ALIGNMENT_FUDGE -
 			    sc->rfa_size) ||
 			    status & (FXP_RFA_STATUS_CRC |
-			    FXP_RFA_STATUS_ALIGN)) {
+			    FXP_RFA_STATUS_ALIGN | FXP_RFA_STATUS_OVERRUN)) {
 				m_freem(m);
 				fxp_add_rfabuf(sc, rxp);
 				continue;

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Apr  4 20:45:40 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 226131065675;
	Mon,  4 Apr 2011 20:45:40 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 10F528FC12;
	Mon,  4 Apr 2011 20:45:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34KjddG095364;
	Mon, 4 Apr 2011 20:45:39 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34KjdmX095362;
	Mon, 4 Apr 2011 20:45:39 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201104042045.p34KjdmX095362@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Mon, 4 Apr 2011 20:45:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220345 - stable/7/sys/dev/vte
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 04 Apr 2011 20:45:40 -0000

Author: yongari
Date: Mon Apr  4 20:45:39 2011
New Revision: 220345
URL: http://svn.freebsd.org/changeset/base/220345

Log:
  MFC r219938:
    Remove unused DMA map/tag in softc.

Modified:
  stable/7/sys/dev/vte/if_vtevar.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/vte/if_vtevar.h
==============================================================================
--- stable/7/sys/dev/vte/if_vtevar.h	Mon Apr  4 20:44:26 2011	(r220344)
+++ stable/7/sys/dev/vte/if_vtevar.h	Mon Apr  4 20:45:39 2011	(r220345)
@@ -80,13 +80,7 @@ struct vte_chain_data {
 	bus_dmamap_t		vte_tx_ring_map;
 	bus_dma_tag_t		vte_rx_ring_tag;
 	bus_dmamap_t		vte_rx_ring_map;
-	bus_dma_tag_t		vte_rr_ring_tag;
-	bus_dmamap_t		vte_rr_ring_map;
 	bus_dmamap_t		vte_rx_sparemap;
-	bus_dma_tag_t		vte_cmb_tag;
-	bus_dmamap_t		vte_cmb_map;
-	bus_dma_tag_t		vte_smb_tag;
-	bus_dmamap_t		vte_smb_map;
 	struct vte_tx_desc	*vte_tx_ring;
 	bus_addr_t		vte_tx_ring_paddr;
 	struct vte_rx_desc	*vte_rx_ring;

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Apr  6 11:14:42 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D03BB1065672;
	Wed,  6 Apr 2011 11:14:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C17838FC16;
	Wed,  6 Apr 2011 11:14:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p36BEgg7086504;
	Wed, 6 Apr 2011 11:14:42 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p36BEgGs086502;
	Wed, 6 Apr 2011 11:14:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201104061114.p36BEgGs086502@svn.freebsd.org>
From: Glen Barber 
Date: Wed, 6 Apr 2011 11:14:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220381 - stable/7/lib/libutil
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 06 Apr 2011 11:14:42 -0000

Author: gjb (doc committer)
Date: Wed Apr  6 11:14:42 2011
New Revision: 220381
URL: http://svn.freebsd.org/changeset/base/220381

Log:
  MFC 219850:
  s/buffer/buf as is used in the code.

Modified:
  stable/7/lib/libutil/humanize_number.3
Directory Properties:
  stable/7/lib/libutil/   (props changed)

Modified: stable/7/lib/libutil/humanize_number.3
==============================================================================
--- stable/7/lib/libutil/humanize_number.3	Wed Apr  6 11:13:55 2011	(r220380)
+++ stable/7/lib/libutil/humanize_number.3	Wed Apr  6 11:14:42 2011	(r220381)
@@ -56,12 +56,12 @@ The
 function formats the signed 64-bit quantity given in
 .Fa number
 into
-.Fa buffer .
+.Fa buf .
 A space and then
 .Fa suffix
 is appended to the end.
 The buffer pointed to by
-.Fa buffer
+.Fa buf
 must be at least
 .Fa len
 bytes long.
@@ -69,7 +69,7 @@ bytes long.
 If the formatted number (including
 .Fa suffix )
 would be too long to fit into
-.Fa buffer ,
+.Fa buf ,
 then divide
 .Fa number
 by 1024 until it will.
@@ -98,7 +98,7 @@ The
 argument must be at least 4 plus the length of
 .Fa suffix ,
 in order to ensure a useful result is generated into
-.Fa buffer .
+.Fa buf .
 To use a specific prefix, specify this as
 .Fa scale
 (multiplier = 1024 ^ scale).
@@ -139,7 +139,7 @@ with 1000 instead of 1024.
 The
 .Fn humanize_number
 function returns the number of characters stored in
-.Fa buffer
+.Fa buf
 (excluding the terminating
 .Dv NUL )
 upon success, or \-1 upon failure.

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Apr  7 16:06:39 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9145106566B;
	Thu,  7 Apr 2011 16:06:39 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B628C8FC12;
	Thu,  7 Apr 2011 16:06:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p37G6deC045534;
	Thu, 7 Apr 2011 16:06:39 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p37G6dDa045532;
	Thu, 7 Apr 2011 16:06:39 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201104071606.p37G6dDa045532@svn.freebsd.org>
From: Jaakko Heinonen 
Date: Thu, 7 Apr 2011 16:06:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220426 - stable/7/usr.bin/truss
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 07 Apr 2011 16:06:39 -0000

Author: jh
Date: Thu Apr  7 16:06:39 2011
New Revision: 220426
URL: http://svn.freebsd.org/changeset/base/220426

Log:
  MFC r216224:
  
  Don't write the terminating NUL past end of buffer.
  
  PR:		bin/152345

Modified:
  stable/7/usr.bin/truss/syscalls.c
Directory Properties:
  stable/7/usr.bin/truss/   (props changed)

Modified: stable/7/usr.bin/truss/syscalls.c
==============================================================================
--- stable/7/usr.bin/truss/syscalls.c	Thu Apr  7 14:17:55 2011	(r220425)
+++ stable/7/usr.bin/truss/syscalls.c	Thu Apr  7 16:06:39 2011	(r220426)
@@ -475,7 +475,7 @@ get_string(pid_t pid, void *offset, int 
 			buf = realloc(buf, totalsize);
 			size = BLOCKSIZE;
 		} else {
-			buf[totalsize] = '\0';
+			buf[totalsize - 1] = '\0';
 			return (buf);
 		}
 	}

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr  8 06:55:26 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03637106566C;
	Fri,  8 Apr 2011 06:55:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E76518FC14;
	Fri,  8 Apr 2011 06:55:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p386tPLE067033;
	Fri, 8 Apr 2011 06:55:25 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p386tPmr067031;
	Fri, 8 Apr 2011 06:55:25 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201104080655.p386tPmr067031@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 8 Apr 2011 06:55:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220441 - stable/7/libexec/rtld-elf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 08 Apr 2011 06:55:26 -0000

Author: avg
Date: Fri Apr  8 06:55:25 2011
New Revision: 220441
URL: http://svn.freebsd.org/changeset/base/220441

Log:
  MFC r220004: rtld: eliminate double call to close(2) that may occur in load_object

Modified:
  stable/7/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/7/libexec/rtld-elf/   (props changed)

Modified: stable/7/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/7/libexec/rtld-elf/rtld.c	Fri Apr  8 06:50:26 2011	(r220440)
+++ stable/7/libexec/rtld-elf/rtld.c	Fri Apr  8 06:55:25 2011	(r220441)
@@ -1474,12 +1474,9 @@ load_object(const char *name, const Obj_
 	free(path);
 	return NULL;
     }
-    for (obj = obj_list->next;  obj != NULL;  obj = obj->next) {
-	if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) {
-	    close(fd);
+    for (obj = obj_list->next;  obj != NULL;  obj = obj->next)
+	if (obj->ino == sb.st_ino && obj->dev == sb.st_dev)
 	    break;
-	}
-    }
     if (obj != NULL) {
 	object_add_name(obj, name);
 	free(path);

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr  8 19:08:49 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C9AB1065672;
	Fri,  8 Apr 2011 19:08:49 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 100E88FC18;
	Fri,  8 Apr 2011 19:08:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p38J8muH089364;
	Fri, 8 Apr 2011 19:08:48 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p38J8m7Q089362;
	Fri, 8 Apr 2011 19:08:48 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201104081908.p38J8m7Q089362@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Fri, 8 Apr 2011 19:08:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220458 - stable/7/sys/dev/age
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 08 Apr 2011 19:08:49 -0000

Author: yongari
Date: Fri Apr  8 19:08:48 2011
New Revision: 220458
URL: http://svn.freebsd.org/changeset/base/220458

Log:
  MFC r220249,220252:
  r220249:
    64bit DMA caused data corruption. Unfortunately there is no known
    workaround to use 64bit DMA.
    Disable 64bit DMA on Attansic L1 controller.
  
    Tested by:	Yamagi Burmeister (lists <> yamagi dot org)
  
  r220252:
    Partially revert r184106. RX buffer ring also needs bus_dmamap_sync().
  
    Tested by:	Yamagi Burmeister (lists <> yamagi dot org)

Modified:
  stable/7/sys/dev/age/if_age.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/age/if_age.c
==============================================================================
--- stable/7/sys/dev/age/if_age.c	Fri Apr  8 19:06:01 2011	(r220457)
+++ stable/7/sys/dev/age/if_age.c	Fri Apr  8 19:08:48 2011	(r220458)
@@ -1092,11 +1092,14 @@ again:
 	 * Create Tx/Rx buffer parent tag.
 	 * L1 supports full 64bit DMA addressing in Tx/Rx buffers
 	 * so it needs separate parent DMA tag.
+	 * XXX
+	 * It seems enabling 64bit DMA causes data corruption. Limit
+	 * DMA address space to 32bit.
 	 */
 	error = bus_dma_tag_create(
 	    bus_get_dma_tag(sc->age_dev), /* parent */
 	    1, 0,			/* alignment, boundary */
-	    BUS_SPACE_MAXADDR,		/* lowaddr */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
 	    BUS_SPACE_MAXADDR,		/* highaddr */
 	    NULL, NULL,			/* filter, filterarg */
 	    BUS_SPACE_MAXSIZE_32BIT,	/* maxsize */
@@ -2421,6 +2424,8 @@ age_rxintr(struct age_softc *sc, int rr_
 	bus_dmamap_sync(sc->age_cdata.age_rr_ring_tag,
 	    sc->age_cdata.age_rr_ring_map,
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+	bus_dmamap_sync(sc->age_cdata.age_rx_ring_tag,
+	    sc->age_cdata.age_rx_ring_map, BUS_DMASYNC_POSTWRITE);
 
 	for (prog = 0; rr_cons != rr_prod; prog++) {
 		if (count <= 0)
@@ -2452,6 +2457,8 @@ age_rxintr(struct age_softc *sc, int rr_
 		/* Update the consumer index. */
 		sc->age_cdata.age_rr_cons = rr_cons;
 
+		bus_dmamap_sync(sc->age_cdata.age_rx_ring_tag,
+		    sc->age_cdata.age_rx_ring_map, BUS_DMASYNC_PREWRITE);
 		/* Sync descriptors. */
 		bus_dmamap_sync(sc->age_cdata.age_rr_ring_tag,
 		    sc->age_cdata.age_rr_ring_map,
@@ -2978,8 +2985,7 @@ age_init_rx_ring(struct age_softc *sc)
 	}
 
 	bus_dmamap_sync(sc->age_cdata.age_rx_ring_tag,
-	    sc->age_cdata.age_rx_ring_map,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	    sc->age_cdata.age_rx_ring_map, BUS_DMASYNC_PREWRITE);
 
 	return (0);
 }

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 09:12:44 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79F5B106566B;
	Sat,  9 Apr 2011 09:12:44 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E0F58FC16;
	Sat,  9 Apr 2011 09:12:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p399CiXD007289;
	Sat, 9 Apr 2011 09:12:44 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p399CiT6007286;
	Sat, 9 Apr 2011 09:12:44 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201104090912.p399CiT6007286@svn.freebsd.org>
From: Andriy Gapon 
Date: Sat, 9 Apr 2011 09:12:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220471 - in stable/7/sys: amd64/linux32 i386/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 09:12:44 -0000

Author: avg
Date: Sat Apr  9 09:12:44 2011
New Revision: 220471
URL: http://svn.freebsd.org/changeset/base/220471

Log:
  MFC r220028: linux compat: add non-dummy capget and capset system calls
  
  PR:		kern/149168

Modified:
  stable/7/sys/amd64/linux32/syscalls.master
  stable/7/sys/i386/linux/syscalls.master
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/7/sys/amd64/linux32/syscalls.master	Sat Apr  9 09:07:31 2011	(r220470)
+++ stable/7/sys/amd64/linux32/syscalls.master	Sat Apr  9 09:12:44 2011	(r220471)
@@ -327,8 +327,10 @@
 				    l_uid16_t uid, l_gid16_t gid); }
 183	AUE_GETCWD	STD	{ int linux_getcwd(char *buf, \
 				    l_ulong bufsize); }
-184	AUE_CAPGET	STD	{ int linux_capget(void); }
-185	AUE_CAPSET	STD	{ int linux_capset(void); }
+184	AUE_CAPGET	STD	{ int linux_capget(struct l_user_cap_header *hdrp, \
+				    struct l_user_cap_data *datap); }
+185	AUE_CAPSET	STD	{ int linux_capset(struct l_user_cap_header *hdrp, \
+				    struct l_user_cap_data *datap); }
 186	AUE_NULL	STD	{ int linux_sigaltstack(l_stack_t *uss, \
 				    l_stack_t *uoss); }
 187	AUE_SENDFILE	STD	{ int linux_sendfile(void); }

Modified: stable/7/sys/i386/linux/syscalls.master
==============================================================================
--- stable/7/sys/i386/linux/syscalls.master	Sat Apr  9 09:07:31 2011	(r220470)
+++ stable/7/sys/i386/linux/syscalls.master	Sat Apr  9 09:12:44 2011	(r220471)
@@ -329,8 +329,10 @@
 				    l_uid16_t uid, l_gid16_t gid); }
 183	AUE_GETCWD	STD	{ int linux_getcwd(char *buf, \
 				    l_ulong bufsize); }
-184	AUE_CAPGET	STD	{ int linux_capget(void); }
-185	AUE_CAPSET	STD	{ int linux_capset(void); }
+184	AUE_CAPGET	STD	{ int linux_capget(struct l_user_cap_header *hdrp, \
+				    struct l_user_cap_data *datap); }
+185	AUE_CAPSET	STD	{ int linux_capset(struct l_user_cap_header *hdrp, \
+				    struct l_user_cap_data *datap); }
 186	AUE_NULL	STD	{ int linux_sigaltstack(l_stack_t *uss, \
 				    l_stack_t *uoss); }
 187	AUE_SENDFILE	STD	{ int linux_sendfile(void); }

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 09:20:11 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DDB24106566C;
	Sat,  9 Apr 2011 09:20:11 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CB2008FC14;
	Sat,  9 Apr 2011 09:20:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p399KBP5007465;
	Sat, 9 Apr 2011 09:20:11 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p399KBrS007458;
	Sat, 9 Apr 2011 09:20:11 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201104090920.p399KBrS007458@svn.freebsd.org>
From: Andriy Gapon 
Date: Sat, 9 Apr 2011 09:20:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220472 - in stable/7/sys: amd64/linux32 i386/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 09:20:12 -0000

Author: avg
Date: Sat Apr  9 09:20:11 2011
New Revision: 220472
URL: http://svn.freebsd.org/changeset/base/220472

Log:
  Regen after r220471
  
  PR:		kern/149168

Modified:
  stable/7/sys/amd64/linux32/linux32_proto.h
  stable/7/sys/amd64/linux32/linux32_syscall.h
  stable/7/sys/amd64/linux32/linux32_sysent.c
  stable/7/sys/i386/linux/linux_proto.h
  stable/7/sys/i386/linux/linux_syscall.h
  stable/7/sys/i386/linux/linux_sysent.c

Modified: stable/7/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_proto.h	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/amd64/linux32/linux32_proto.h	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 194400 2009-06-17 21:12:32Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -585,10 +585,12 @@ struct linux_getcwd_args {
 	char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)];
 };
 struct linux_capget_args {
-	register_t dummy;
+	char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)];
+	char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)];
 };
 struct linux_capset_args {
-	register_t dummy;
+	char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)];
+	char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)];
 };
 struct linux_sigaltstack_args {
 	char uss_l_[PADL_(l_stack_t *)]; l_stack_t * uss; char uss_r_[PADR_(l_stack_t *)];

Modified: stable/7/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_syscall.h	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/amd64/linux32/linux32_syscall.h	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 194400 2009-06-17 21:12:32Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #define	LINUX_SYS_exit	1

Modified: stable/7/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_sysent.c	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/amd64/linux32/linux32_sysent.c	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 194400 2009-06-17 21:12:32Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #include "opt_compat.h"
@@ -203,8 +203,8 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 },	/* 181 = linux_pwrite */
 	{ AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 },	/* 182 = linux_chown16 */
 	{ AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 },	/* 183 = linux_getcwd */
-	{ 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 },	/* 184 = linux_capget */
-	{ 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 },	/* 185 = linux_capset */
+	{ AS(linux_capget_args), (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 },	/* 184 = linux_capget */
+	{ AS(linux_capset_args), (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 },	/* 185 = linux_capset */
 	{ AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 },	/* 186 = linux_sigaltstack */
 	{ 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 },	/* 187 = linux_sendfile */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 188 = getpmsg */

Modified: stable/7/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/7/sys/i386/linux/linux_proto.h	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/i386/linux/linux_proto.h	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -582,10 +582,12 @@ struct linux_getcwd_args {
 	char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)];
 };
 struct linux_capget_args {
-	register_t dummy;
+	char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)];
+	char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)];
 };
 struct linux_capset_args {
-	register_t dummy;
+	char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)];
+	char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)];
 };
 struct linux_sigaltstack_args {
 	char uss_l_[PADL_(l_stack_t *)]; l_stack_t * uss; char uss_r_[PADR_(l_stack_t *)];

Modified: stable/7/sys/i386/linux/linux_syscall.h
==============================================================================
--- stable/7/sys/i386/linux/linux_syscall.h	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/i386/linux/linux_syscall.h	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #define	LINUX_SYS_exit	1

Modified: stable/7/sys/i386/linux/linux_sysent.c
==============================================================================
--- stable/7/sys/i386/linux/linux_sysent.c	Sat Apr  9 09:12:44 2011	(r220471)
+++ stable/7/sys/i386/linux/linux_sysent.c	Sat Apr  9 09:20:11 2011	(r220472)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 220471 2011-04-09 09:12:44Z avg 
  */
 
 #include 
@@ -202,8 +202,8 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 },	/* 181 = linux_pwrite */
 	{ AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 },	/* 182 = linux_chown16 */
 	{ AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 },	/* 183 = linux_getcwd */
-	{ 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 },	/* 184 = linux_capget */
-	{ 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 },	/* 185 = linux_capset */
+	{ AS(linux_capget_args), (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 },	/* 184 = linux_capget */
+	{ AS(linux_capset_args), (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 },	/* 185 = linux_capset */
 	{ AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 },	/* 186 = linux_sigaltstack */
 	{ 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 },	/* 187 = linux_sendfile */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 188 = getpmsg */

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 09:27:11 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3F81106566B;
	Sat,  9 Apr 2011 09:27:11 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B27618FC16;
	Sat,  9 Apr 2011 09:27:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p399RBff007666;
	Sat, 9 Apr 2011 09:27:11 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p399RBNK007663;
	Sat, 9 Apr 2011 09:27:11 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201104090927.p399RBNK007663@svn.freebsd.org>
From: Andriy Gapon 
Date: Sat, 9 Apr 2011 09:27:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220473 - in stable/7/sys: amd64/linux32 i386/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 09:27:11 -0000

Author: avg
Date: Sat Apr  9 09:27:11 2011
New Revision: 220473
URL: http://svn.freebsd.org/changeset/base/220473

Log:
  MFC r220030: drop dummy definitions
  
  PR:		kern/149168

Modified:
  stable/7/sys/amd64/linux32/linux32_dummy.c
  stable/7/sys/i386/linux/linux_dummy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_dummy.c	Sat Apr  9 09:20:11 2011	(r220472)
+++ stable/7/sys/amd64/linux32/linux32_dummy.c	Sat Apr  9 09:27:11 2011	(r220473)
@@ -54,8 +54,6 @@ DUMMY(sysfs);
 DUMMY(query_module);
 DUMMY(nfsservctl);
 DUMMY(rt_sigqueueinfo);
-DUMMY(capget);
-DUMMY(capset);
 DUMMY(sendfile);
 DUMMY(truncate64);
 DUMMY(setfsuid);

Modified: stable/7/sys/i386/linux/linux_dummy.c
==============================================================================
--- stable/7/sys/i386/linux/linux_dummy.c	Sat Apr  9 09:20:11 2011	(r220472)
+++ stable/7/sys/i386/linux/linux_dummy.c	Sat Apr  9 09:27:11 2011	(r220473)
@@ -57,8 +57,6 @@ DUMMY(vm86);
 DUMMY(query_module);
 DUMMY(nfsservctl);
 DUMMY(rt_sigqueueinfo);
-DUMMY(capget);
-DUMMY(capset);
 DUMMY(sendfile);		/* different semantics */
 DUMMY(truncate64);
 DUMMY(setfsuid);

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 09:33:37 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20BA11065672;
	Sat,  9 Apr 2011 09:33:37 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E22B8FC17;
	Sat,  9 Apr 2011 09:33:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p399XbTm007853;
	Sat, 9 Apr 2011 09:33:37 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p399XaxL007848;
	Sat, 9 Apr 2011 09:33:36 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201104090933.p399XaxL007848@svn.freebsd.org>
From: Andriy Gapon 
Date: Sat, 9 Apr 2011 09:33:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220474 - stable/7/sys/compat/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 09:33:37 -0000

Author: avg
Date: Sat Apr  9 09:33:36 2011
New Revision: 220474
URL: http://svn.freebsd.org/changeset/base/220474

Log:
  MFC r220031: linux compat: improve and fix sendmsg/recvmsg compatibility
  
  PR:		kern/149168

Modified:
  stable/7/sys/compat/linux/linux_misc.c
  stable/7/sys/compat/linux/linux_misc.h
  stable/7/sys/compat/linux/linux_socket.c
  stable/7/sys/compat/linux/linux_socket.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.c	Sat Apr  9 09:27:11 2011	(r220473)
+++ stable/7/sys/compat/linux/linux_misc.c	Sat Apr  9 09:33:36 2011	(r220474)
@@ -1633,6 +1633,100 @@ linux_exit_group(struct thread *td, stru
 	return (0);
 }
 
+#define _LINUX_CAPABILITY_VERSION  0x19980330
+
+struct l_user_cap_header {
+	l_int	version;
+	l_int	pid;
+};
+
+struct l_user_cap_data {
+	l_int	effective;
+	l_int	permitted;
+	l_int	inheritable;
+};
+
+int
+linux_capget(struct thread *td, struct linux_capget_args *args)
+{
+	struct l_user_cap_header luch;
+	struct l_user_cap_data lucd;
+	int error;
+
+	if (args->hdrp == NULL)
+		return (EFAULT);
+
+	error = copyin(args->hdrp, &luch, sizeof(luch));
+	if (error != 0)
+		return (error);
+
+	if (luch.version != _LINUX_CAPABILITY_VERSION) {
+		luch.version = _LINUX_CAPABILITY_VERSION;
+		error = copyout(&luch, args->hdrp, sizeof(luch));
+		if (error)
+			return (error);
+		return (EINVAL);
+	}
+
+	if (luch.pid)
+		return (EPERM);
+
+	if (args->datap) {
+		/*
+		 * The current implementation doesn't support setting
+		 * a capability (it's essentially a stub) so indicate
+		 * that no capabilities are currently set or available
+		 * to request.
+		 */
+		bzero (&lucd, sizeof(lucd));
+		error = copyout(&lucd, args->datap, sizeof(lucd));
+	}
+
+	return (error);
+}
+
+int
+linux_capset(struct thread *td, struct linux_capset_args *args)
+{
+	struct l_user_cap_header luch;
+	struct l_user_cap_data lucd;
+	int error;
+
+	if (args->hdrp == NULL || args->datap == NULL)
+		return (EFAULT);
+
+	error = copyin(args->hdrp, &luch, sizeof(luch));
+	if (error != 0)
+		return (error);
+
+	if (luch.version != _LINUX_CAPABILITY_VERSION) {
+		luch.version = _LINUX_CAPABILITY_VERSION;
+		error = copyout(&luch, args->hdrp, sizeof(luch));
+		if (error)
+			return (error);
+		return (EINVAL);
+	}
+
+	if (luch.pid)
+		return (EPERM);
+
+	error = copyin(args->datap, &lucd, sizeof(lucd));
+	if (error != 0)
+		return (error);
+
+	/* We currently don't support setting any capabilities. */
+	if (lucd.effective || lucd.permitted || lucd.inheritable) {
+		linux_msg(td,
+			  "capset effective=0x%x, permitted=0x%x, "
+			  "inheritable=0x%x is not implemented",
+			  (int)lucd.effective, (int)lucd.permitted,
+			  (int)lucd.inheritable);
+		return (EPERM);
+	}
+
+	return (0);
+}
+
 int
 linux_prctl(struct thread *td, struct linux_prctl_args *args)
 {
@@ -1666,6 +1760,21 @@ linux_prctl(struct thread *td, struct li
 		    (void *)(register_t)args->arg2,
 		    sizeof(pdeath_signal));
 		break;
+	case LINUX_PR_GET_KEEPCAPS:
+		/*
+		 * Indicate that we always clear the effective and
+		 * permitted capability sets when the user id becomes
+		 * non-zero (actually the capability sets are simply
+		 * always zero in the current implementation).
+		 */
+		td->td_retval[0] = 0;
+		break;
+	case LINUX_PR_SET_KEEPCAPS:
+		/*
+		 * Ignore requests to keep the effective and permitted
+		 * capability sets when the user id becomes non-zero.
+		 */
+		break;
 	case LINUX_PR_SET_NAME:
 		/*
 		 * To be on the safe side we need to make sure to not

Modified: stable/7/sys/compat/linux/linux_misc.h
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.h	Sat Apr  9 09:27:11 2011	(r220473)
+++ stable/7/sys/compat/linux/linux_misc.h	Sat Apr  9 09:33:36 2011	(r220474)
@@ -37,6 +37,8 @@
 					 * Second arg is a ptr to return the
 					 * signal.
 					 */
+#define	LINUX_PR_GET_KEEPCAPS	7	/* Get drop capabilities on setuid */
+#define	LINUX_PR_SET_KEEPCAPS	8	/* Set drop capabilities on setuid */
 #define	LINUX_PR_SET_NAME	15	/* Set process name. */
 #define	LINUX_PR_GET_NAME	16	/* Get process name. */
 

Modified: stable/7/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.c	Sat Apr  9 09:27:11 2011	(r220473)
+++ stable/7/sys/compat/linux/linux_socket.c	Sat Apr  9 09:33:36 2011	(r220474)
@@ -431,6 +431,8 @@ linux_to_bsd_cmsg_type(int cmsg_type)
 	switch (cmsg_type) {
 	case LINUX_SCM_RIGHTS:
 		return (SCM_RIGHTS);
+	case LINUX_SCM_CREDENTIALS:
+		return (SCM_CREDS);
 	}
 	return (-1);
 }
@@ -442,6 +444,8 @@ bsd_to_linux_cmsg_type(int cmsg_type)
 	switch (cmsg_type) {
 	case SCM_RIGHTS:
 		return (LINUX_SCM_RIGHTS);
+	case SCM_CREDS:
+		return (LINUX_SCM_CREDENTIALS);
 	}
 	return (-1);
 }
@@ -459,7 +463,16 @@ linux_to_bsd_msghdr(struct msghdr *bhdr,
 	bhdr->msg_iov		= PTRIN(lhdr->msg_iov);
 	bhdr->msg_iovlen	= lhdr->msg_iovlen;
 	bhdr->msg_control	= PTRIN(lhdr->msg_control);
-	bhdr->msg_controllen	= lhdr->msg_controllen;
+
+	/*
+	 * msg_controllen is skipped since BSD and LINUX control messages
+	 * are potentially different sizes (e.g. the cred structure used
+	 * by SCM_CREDS is different between the two operating system).
+	 *
+	 * The caller can set it (if necessary) after converting all the
+	 * control messages.
+	 */
+
 	bhdr->msg_flags		= linux_to_bsd_msg_flags(lhdr->msg_flags);
 	return (0);
 }
@@ -472,7 +485,16 @@ bsd_to_linux_msghdr(const struct msghdr 
 	lhdr->msg_iov		= PTROUT(bhdr->msg_iov);
 	lhdr->msg_iovlen	= bhdr->msg_iovlen;
 	lhdr->msg_control	= PTROUT(bhdr->msg_control);
-	lhdr->msg_controllen	= bhdr->msg_controllen;
+
+	/*
+	 * msg_controllen is skipped since BSD and LINUX control messages
+	 * are potentially different sizes (e.g. the cred structure used
+	 * by SCM_CREDS is different between the two operating system).
+	 *
+	 * The caller can set it (if necessary) after converting all the
+	 * control messages.
+	 */
+
 	/* msg_flags skipped */
 	return (0);
 }
@@ -1034,6 +1056,7 @@ static int
 linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args)
 {
 	struct cmsghdr *cmsg;
+	struct cmsgcred cmcred;
 	struct mbuf *control;
 	struct msghdr msg;
 	struct l_cmsghdr linux_cmsg;
@@ -1041,15 +1064,14 @@ linux_sendmsg(struct thread *td, struct 
 	struct l_msghdr linux_msg;
 	struct iovec *iov;
 	socklen_t datalen;
+	struct sockaddr *sa;
+	sa_family_t sa_family;
 	void *data;
 	int error;
 
 	error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
 	if (error)
 		return (error);
-	error = linux_to_bsd_msghdr(&msg, &linux_msg);
-	if (error)
-		return (error);
 
 	/*
 	 * Some Linux applications (ping) define a non-NULL control data
@@ -1058,8 +1080,12 @@ linux_sendmsg(struct thread *td, struct 
 	 * order to handle this case.  This should be checked, but allows the
 	 * Linux ping to work.
 	 */
-	if (msg.msg_control != NULL && msg.msg_controllen == 0)
-		msg.msg_control = NULL;
+	if (PTRIN(linux_msg.msg_control) != NULL && linux_msg.msg_controllen == 0)
+		linux_msg.msg_control = PTROUT(NULL);
+
+	error = linux_to_bsd_msghdr(&msg, &linux_msg);
+	if (error)
+		return (error);
 
 #ifdef COMPAT_LINUX32
 	error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
@@ -1070,13 +1096,21 @@ linux_sendmsg(struct thread *td, struct 
 	if (error)
 		return (error);
 
-	if (msg.msg_control != NULL) {
+	control = NULL;
+	cmsg = NULL;
+
+	if ((ptr_cmsg = LINUX_CMSG_FIRSTHDR(&linux_msg)) != NULL) {
+		error = kern_getsockname(td, args->s, &sa, &datalen);
+		if (error)
+			goto bad;
+		sa_family = sa->sa_family;
+		free(sa, M_SONAME);
+
 		error = ENOBUFS;
 		cmsg = malloc(CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
 		control = m_get(M_WAIT, MT_CONTROL);
 		if (control == NULL)
 			goto bad;
-		ptr_cmsg = LINUX_CMSG_FIRSTHDR(&msg);
 
 		do {
 			error = copyin(ptr_cmsg, &linux_cmsg,
@@ -1089,28 +1123,58 @@ linux_sendmsg(struct thread *td, struct 
 				goto bad;
 
 			/*
-			 * Now we support only SCM_RIGHTS, so return EINVAL
-			 * in any other cmsg_type
+			 * Now we support only SCM_RIGHTS and SCM_CRED,
+			 * so return EINVAL in any other cmsg_type
 			 */
-			if ((cmsg->cmsg_type =
-			    linux_to_bsd_cmsg_type(linux_cmsg.cmsg_type)) == -1)
-				goto bad;
+			cmsg->cmsg_type =
+			    linux_to_bsd_cmsg_type(linux_cmsg.cmsg_type);
 			cmsg->cmsg_level =
 			    linux_to_bsd_sockopt_level(linux_cmsg.cmsg_level);
+			if (cmsg->cmsg_type == -1
+			    || cmsg->cmsg_level != SOL_SOCKET)
+				goto bad;
 
+			/*
+			 * Some applications (e.g. pulseaudio) attempt to
+			 * send ancillary data even if the underlying protocol
+			 * doesn't support it which is not allowed in the
+			 * FreeBSD system call interface.
+			 */
+			if (sa_family != AF_UNIX)
+				continue;
+
+			data = LINUX_CMSG_DATA(ptr_cmsg);
 			datalen = linux_cmsg.cmsg_len - L_CMSG_HDRSZ;
+
+			switch (cmsg->cmsg_type)
+			{
+			case SCM_RIGHTS:
+				break;
+
+			case SCM_CREDS:
+				data = &cmcred;
+				datalen = sizeof(cmcred);
+
+				/*
+				 * The lower levels will fill in the structure
+				 */
+				bzero(data, datalen);
+				break;
+			}
+
 			cmsg->cmsg_len = CMSG_LEN(datalen);
-			data = LINUX_CMSG_DATA(ptr_cmsg);
 
 			error = ENOBUFS;
 			if (!m_append(control, CMSG_HDRSZ, (c_caddr_t) cmsg))
 				goto bad;
 			if (!m_append(control, datalen, (c_caddr_t) data))
 				goto bad;
-		} while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&msg, ptr_cmsg)));
-	} else {
-		control = NULL;
-		cmsg = NULL;
+		} while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&linux_msg, ptr_cmsg)));
+
+		if (m_length(control, NULL) == 0) {
+			m_freem(control);
+			control = NULL;
+		}
 	}
 
 	msg.msg_iov = iov;
@@ -1135,9 +1199,11 @@ static int
 linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args)
 {
 	struct cmsghdr *cm;
+	struct cmsgcred *cmcred;
 	struct msghdr msg;
 	struct l_cmsghdr *linux_cmsg = NULL;
-	socklen_t datalen, outlen, clen;
+	struct l_ucred linux_ucred;
+	socklen_t datalen, outlen;
 	struct l_msghdr linux_msg;
 	struct iovec *iov, *uiov;
 	struct mbuf *control = NULL;
@@ -1194,39 +1260,35 @@ linux_recvmsg(struct thread *td, struct 
 			goto bad;
 	}
 
-	if (control) {
+	outbuf = PTRIN(linux_msg.msg_control);
+	outlen = 0;
 
+	if (control) {
 		linux_cmsg = malloc(L_CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
-		outbuf = PTRIN(linux_msg.msg_control);
-		cm = mtod(control, struct cmsghdr *);
-		outlen = 0;
-		clen = control->m_len;
 
-		while (cm != NULL) {
+		msg.msg_control = mtod(control, struct cmsghdr *);
+		msg.msg_controllen = control->m_len;
+
+		cm = CMSG_FIRSTHDR(&msg);
 
-			if ((linux_cmsg->cmsg_type =
-			    bsd_to_linux_cmsg_type(cm->cmsg_type)) == -1)
+		while (cm != NULL) {
+			linux_cmsg->cmsg_type =
+			    bsd_to_linux_cmsg_type(cm->cmsg_type);
+			linux_cmsg->cmsg_level =
+			    bsd_to_linux_sockopt_level(cm->cmsg_level);
+			if (linux_cmsg->cmsg_type == -1
+			    || cm->cmsg_level != SOL_SOCKET)
 			{
 				error = EINVAL;
 				goto bad;
 			}
+
 			data = CMSG_DATA(cm);
 			datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data;
 
-			switch (linux_cmsg->cmsg_type)
+			switch (cm->cmsg_type)
 			{
-			case LINUX_SCM_RIGHTS:
-				if (outlen + LINUX_CMSG_LEN(datalen) >
-				    linux_msg.msg_controllen) {
-					if (outlen == 0) {
-						error = EMSGSIZE;
-						goto bad;
-					} else {
-						linux_msg.msg_flags |=
-						    LINUX_MSG_CTRUNC;
-						goto out;
-					}
-				}
+			case SCM_RIGHTS:
 				if (args->flags & LINUX_MSG_CMSG_CLOEXEC) {
 					fds = datalen / sizeof(int);
 					fdp = data;
@@ -1237,11 +1299,40 @@ linux_recvmsg(struct thread *td, struct 
 					}
 				}
 				break;
+
+			case SCM_CREDS:
+				/*
+				 * Currently LOCAL_CREDS is never in
+				 * effect for Linux so no need to worry
+				 * about sockcred
+				 */
+				if (datalen != sizeof (*cmcred)) {
+					error = EMSGSIZE;
+					goto bad;
+				}
+				cmcred = (struct cmsgcred *)data;
+				bzero(&linux_ucred, sizeof(linux_ucred));
+				linux_ucred.pid = cmcred->cmcred_pid;
+				linux_ucred.uid = cmcred->cmcred_uid;
+				linux_ucred.gid = cmcred->cmcred_gid;
+				data = &linux_ucred;
+				datalen = sizeof(linux_ucred);
+				break;
+			}
+
+			if (outlen + LINUX_CMSG_LEN(datalen) >
+			    linux_msg.msg_controllen) {
+				if (outlen == 0) {
+					error = EMSGSIZE;
+					goto bad;
+				} else {
+					linux_msg.msg_flags |=
+					    LINUX_MSG_CTRUNC;
+					goto out;
+				}
 			}
 
 			linux_cmsg->cmsg_len = LINUX_CMSG_LEN(datalen);
-			linux_cmsg->cmsg_level =
-			    bsd_to_linux_sockopt_level(cm->cmsg_level);
 
 			error = copyout(linux_cmsg, outbuf, L_CMSG_HDRSZ);
 			if (error)
@@ -1254,18 +1345,13 @@ linux_recvmsg(struct thread *td, struct 
 
 			outbuf += LINUX_CMSG_ALIGN(datalen);
 			outlen += LINUX_CMSG_LEN(datalen);
-			linux_msg.msg_controllen = outlen;
 
-			if (CMSG_SPACE(datalen) < clen) {
-				clen -= CMSG_SPACE(datalen);
-				cm = (struct cmsghdr *)
-				    ((caddr_t)cm + CMSG_SPACE(datalen));
-			} else
-				cm = NULL;
+			cm = CMSG_NXTHDR(&msg, cm);
 		}
 	}
 
 out:
+	linux_msg.msg_controllen = outlen;
 	error = copyout(&linux_msg, PTRIN(args->msg), sizeof(linux_msg));
 
 bad:

Modified: stable/7/sys/compat/linux/linux_socket.h
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.h	Sat Apr  9 09:27:11 2011	(r220473)
+++ stable/7/sys/compat/linux/linux_socket.h	Sat Apr  9 09:33:36 2011	(r220474)
@@ -53,6 +53,7 @@
 /* Socket-level control message types */
 
 #define LINUX_SCM_RIGHTS	0x01
+#define LINUX_SCM_CREDENTIALS   0x02
 
 /* Ancilliary data object information macros */
 
@@ -66,13 +67,14 @@
 #define LINUX_CMSG_FIRSTHDR(msg) \
 				((msg)->msg_controllen >= \
 				    sizeof(struct l_cmsghdr) ? \
-				    (struct l_cmsghdr *)((msg)->msg_control) : \
+				    (struct l_cmsghdr *) \
+				        PTRIN((msg)->msg_control) : \
 				    (struct l_cmsghdr *)(NULL))
 #define LINUX_CMSG_NXTHDR(msg, cmsg) \
 				((((char *)(cmsg) + \
 				    LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
 				    sizeof(*(cmsg))) > \
-				    (((char *)(msg)->msg_control) + \
+				    (((char *)PTRIN((msg)->msg_control)) + \
 				    (msg)->msg_controllen)) ? \
 				    (struct l_cmsghdr *) NULL : \
 				    (struct l_cmsghdr *)((char *)(cmsg) + \

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 10:18:46 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D925106566C;
	Sat,  9 Apr 2011 10:18:46 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AA148FC1F;
	Sat,  9 Apr 2011 10:18:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39AIk5N008766;
	Sat, 9 Apr 2011 10:18:46 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39AIkdE008764;
	Sat, 9 Apr 2011 10:18:46 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091018.p39AIkdE008764@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 10:18:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220475 - stable/7/usr.sbin/rtadvd
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 10:18:46 -0000

Author: bz
Date: Sat Apr  9 10:18:46 2011
New Revision: 220475
URL: http://svn.freebsd.org/changeset/base/220475

Log:
  MFC r219184:
  
    Prevent crashes from a race when (cloned) interfaces go away.
  
  PR:		bin/152143
    Submitted by:	Przemyslaw Frasunek (przemyslaw frasunek.com)
    Tested by:	Przemyslaw Frasunek (przemyslaw frasunek.com)

Modified:
  stable/7/usr.sbin/rtadvd/rtadvd.c
Directory Properties:
  stable/7/usr.sbin/rtadvd/   (props changed)

Modified: stable/7/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- stable/7/usr.sbin/rtadvd/rtadvd.c	Sat Apr  9 09:33:36 2011	(r220474)
+++ stable/7/usr.sbin/rtadvd/rtadvd.c	Sat Apr  9 10:18:46 2011	(r220475)
@@ -667,14 +667,16 @@ rtadvd_input()
 	}
 
 	/*
-	 * If we happen to receive data on an interface which is now down,
-	 * just discard the data.
+	 * If we happen to receive data on an interface which is now gone
+	 * or down, just discard the data.
 	 */
-	if ((iflist[pi->ipi6_ifindex]->ifm_flags & IFF_UP) == 0) {
+	if (iflist[pi->ipi6_ifindex] == NULL ||
+	    (iflist[pi->ipi6_ifindex]->ifm_flags & IFF_UP) == 0) {
 		syslog(LOG_INFO,
 		       "<%s> received data on a disabled interface (%s)",
 		       __func__,
-		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
+		       (iflist[pi->ipi6_ifindex] == NULL) ? "[gone]" :
+			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
 	}
 

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 10:22:18 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92694106564A;
	Sat,  9 Apr 2011 10:22:18 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F2028FC0A;
	Sat,  9 Apr 2011 10:22:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39AMIbn008960;
	Sat, 9 Apr 2011 10:22:18 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39AMIER008957;
	Sat, 9 Apr 2011 10:22:18 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091022.p39AMIER008957@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 10:22:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220477 - stable/7/sys/net
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 10:22:18 -0000

Author: bz
Date: Sat Apr  9 10:22:18 2011
New Revision: 220477
URL: http://svn.freebsd.org/changeset/base/220477

Log:
  MFC r219206:
  
    Hide the outer IP addresses of a tunnel interfaces (gif(4), gre(4))
    from processes inside jails if the addresses do not belong to the jail.
  
    Originally reported by: Pieter de Boer via remko
    Tested by:	Piotr KUCHARSKI (nospam 42.pl) [gif]
  PR:		kern/151119

Modified:
  stable/7/sys/net/if_gif.c
  stable/7/sys/net/if_gre.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/net/if_gif.c
==============================================================================
--- stable/7/sys/net/if_gif.c	Sat Apr  9 10:19:25 2011	(r220476)
+++ stable/7/sys/net/if_gif.c	Sat Apr  9 10:22:18 2011	(r220477)
@@ -36,6 +36,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -811,6 +812,12 @@ gif_ioctl(ifp, cmd, data)
 		}
 		if (src->sa_len > size)
 			return EINVAL;
+		error = prison_if(curthread->td_ucred, src);
+		if (error != 0)
+			return (error);
+		error = prison_if(curthread->td_ucred, dst);
+		if (error != 0)
+			return (error);
 		bcopy((caddr_t)src, (caddr_t)dst, src->sa_len);
 #ifdef INET6
 		if (dst->sa_family == AF_INET6) {

Modified: stable/7/sys/net/if_gre.c
==============================================================================
--- stable/7/sys/net/if_gre.c	Sat Apr  9 10:19:25 2011	(r220476)
+++ stable/7/sys/net/if_gre.c	Sat Apr  9 10:22:18 2011	(r220477)
@@ -53,6 +53,7 @@
 #include "opt_inet6.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -642,6 +643,9 @@ gre_ioctl(struct ifnet *ifp, u_long cmd,
 		si.sin_len = sizeof(struct sockaddr_in);
 		si.sin_addr.s_addr = sc->g_src.s_addr;
 		sa = sintosa(&si);
+		error = prison_if(curthread->td_ucred, sa);
+		if (error != 0)
+			break;
 		ifr->ifr_addr = *sa;
 		break;
 	case GREGADDRD:
@@ -650,6 +654,9 @@ gre_ioctl(struct ifnet *ifp, u_long cmd,
 		si.sin_len = sizeof(struct sockaddr_in);
 		si.sin_addr.s_addr = sc->g_dst.s_addr;
 		sa = sintosa(&si);
+		error = prison_if(curthread->td_ucred, sa);
+		if (error != 0)
+			break;
 		ifr->ifr_addr = *sa;
 		break;
 	case SIOCSIFPHYADDR:
@@ -713,8 +720,14 @@ gre_ioctl(struct ifnet *ifp, u_long cmd,
 		si.sin_family = AF_INET;
 		si.sin_len = sizeof(struct sockaddr_in);
 		si.sin_addr.s_addr = sc->g_src.s_addr;
+		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
+		if (error != 0)
+			break;
 		memcpy(&lifr->addr, &si, sizeof(si));
 		si.sin_addr.s_addr = sc->g_dst.s_addr;
+		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
+		if (error != 0)
+			break;
 		memcpy(&lifr->dstaddr, &si, sizeof(si));
 		break;
 	case SIOCGIFPSRCADDR:
@@ -729,6 +742,9 @@ gre_ioctl(struct ifnet *ifp, u_long cmd,
 		si.sin_family = AF_INET;
 		si.sin_len = sizeof(struct sockaddr_in);
 		si.sin_addr.s_addr = sc->g_src.s_addr;
+		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
+		if (error != 0)
+			break;
 		bcopy(&si, &ifr->ifr_addr, sizeof(ifr->ifr_addr));
 		break;
 	case SIOCGIFPDSTADDR:
@@ -743,6 +759,9 @@ gre_ioctl(struct ifnet *ifp, u_long cmd,
 		si.sin_family = AF_INET;
 		si.sin_len = sizeof(struct sockaddr_in);
 		si.sin_addr.s_addr = sc->g_dst.s_addr;
+		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
+		if (error != 0)
+			break;
 		bcopy(&si, &ifr->ifr_addr, sizeof(ifr->ifr_addr));
 		break;
 	case GRESKEY:

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 10:40:17 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9BFD1106564A;
	Sat,  9 Apr 2011 10:40:17 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 893A88FC0A;
	Sat,  9 Apr 2011 10:40:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39AeHKv010950;
	Sat, 9 Apr 2011 10:40:17 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39AeHYV010948;
	Sat, 9 Apr 2011 10:40:17 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091040.p39AeHYV010948@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 10:40:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220479 - stable/7/sys/conf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 10:40:17 -0000

Author: bz
Date: Sat Apr  9 10:40:17 2011
New Revision: 220479
URL: http://svn.freebsd.org/changeset/base/220479

Log:
  MFC r219580:
  
    INET6 for some time needed in_pcb.c so make sure we compile it in case of
    no inet.

Modified:
  stable/7/sys/conf/files
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Sat Apr  9 10:36:33 2011	(r220478)
+++ stable/7/sys/conf/files	Sat Apr  9 10:40:17 2011	(r220479)
@@ -1967,7 +1967,7 @@ netinet/in_gif.c		optional gif inet
 netinet/ip_gre.c		optional gre inet
 netinet/ip_id.c			optional inet
 netinet/in_mcast.c		optional inet
-netinet/in_pcb.c		optional inet
+netinet/in_pcb.c		optional inet | inet6
 netinet/in_proto.c		optional inet \
 	compile-with "${NORMAL_C} -I$S/contrib/pf"
 netinet/in_rmx.c		optional inet

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 10:44:54 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2717E1065680;
	Sat,  9 Apr 2011 10:44:54 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 145658FC12;
	Sat,  9 Apr 2011 10:44:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39Airrl011144;
	Sat, 9 Apr 2011 10:44:53 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39Airdp011142;
	Sat, 9 Apr 2011 10:44:53 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091044.p39Airdp011142@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 10:44:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220481 - stable/7/share/man/man4
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 10:44:54 -0000

Author: bz
Date: Sat Apr  9 10:44:53 2011
New Revision: 220481
URL: http://svn.freebsd.org/changeset/base/220481

Log:
  MFC r219597:
  
    Cross-reference ip(4) rather than sysctl(8) for the global, shared MIB
    values to control the various port ranges. ip(4) describes these in detail.

Modified:
  stable/7/share/man/man4/ip6.4
Directory Properties:
  stable/7/share/man/man4/   (props changed)

Modified: stable/7/share/man/man4/ip6.4
==============================================================================
--- stable/7/share/man/man4/ip6.4	Sat Apr  9 10:44:01 2011	(r220480)
+++ stable/7/share/man/man4/ip6.4	Sat Apr  9 10:44:53 2011	(r220481)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 29, 2006
+.Dd March 13, 2011
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -233,12 +233,13 @@ The following values are available:
 .Bl -tag -width IPV6_PORTRANGE_DEFAULT -compact
 .It Dv IPV6_PORTRANGE_DEFAULT
 Use the regular range of non-reserved ports (varies, see
-.Xr sysctl 8 ) .
+.Xr ip 4 ) .
 .It Dv IPV6_PORTRANGE_HIGH
 Use a high range (varies, see
-.Xr sysctl 8 ) .
+.Xr ip 4 ) .
 .It Dv IPV6_PORTRANGE_LOW
-Use a low, reserved range (600\-1023).
+Use a low, reserved range (600\-1023, see
+.Xr ip 4 ) .
 .El
 .It Dv IPV6_PKTINFO Fa "int *"
 Get or set whether additional information about subsequent packets will
@@ -644,6 +645,7 @@ An ancillary data object was improperly 
 .Xr if_nametoindex 3 ,
 .Xr bpf 4 ,
 .Xr icmp6 4 ,
+.Xr ip 4 ,
 .Xr inet6 4 ,
 .Xr netintro 4 ,
 .Xr tcp 4 ,

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 10:58:38 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 757BF1065673;
	Sat,  9 Apr 2011 10:58:38 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 62A868FC15;
	Sat,  9 Apr 2011 10:58:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39AwcYm011596;
	Sat, 9 Apr 2011 10:58:38 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39AwcoG011594;
	Sat, 9 Apr 2011 10:58:38 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091058.p39AwcoG011594@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 10:58:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220484 - stable/7/sys/netipsec
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 10:58:38 -0000

Author: bz
Date: Sat Apr  9 10:58:38 2011
New Revision: 220484
URL: http://svn.freebsd.org/changeset/base/220484

Log:
  MFC r220247:
  
     Do not allow directly recursive RFC3173 IPComp payload.
  
  Security:	CVE-2011-1547

Modified:
  stable/7/sys/netipsec/xform_ipcomp.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netipsec/xform_ipcomp.c
==============================================================================
--- stable/7/sys/netipsec/xform_ipcomp.c	Sat Apr  9 10:53:36 2011	(r220483)
+++ stable/7/sys/netipsec/xform_ipcomp.c	Sat Apr  9 10:58:38 2011	(r220484)
@@ -139,10 +139,31 @@ ipcomp_input(struct mbuf *m, struct seca
 	struct tdb_crypto *tc;
 	struct cryptodesc *crdc;
 	struct cryptop *crp;
+	struct ipcomp *ipcomp;
+	caddr_t addr;
 	int hlen = IPCOMP_HLENGTH;
 
 	IPSEC_SPLASSERT_SOFTNET(__func__);
 
+	/*
+	 * Check that the next header of the IPComp is not IPComp again, before
+	 * doing any real work.  Given it is not possible to do double
+	 * compression it means someone is playing tricks on us.
+	 */
+	if (m->m_len < skip + hlen && (m = m_pullup(m, skip + hlen)) == NULL) {
+		ipcompstat.ipcomps_hdrops++;		/*XXX*/
+		DPRINTF(("%s: m_pullup failed\n", __func__));
+		return (ENOBUFS);
+	}
+	addr = (caddr_t) mtod(m, struct ip *) + skip;
+	ipcomp = (struct ipcomp *)addr;
+	if (ipcomp->comp_nxt == IPPROTO_IPCOMP) {
+		m_freem(m);
+		ipcompstat.ipcomps_pdrops++;	/* XXX have our own stats? */
+		DPRINTF(("%s: recursive compression detected\n", __func__));
+		return (EINVAL);
+	}
+
 	/* Get crypto descriptors */
 	crp = crypto_getreq(1);
 	if (crp == NULL) {

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 12:15:41 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53BE7106564A;
	Sat,  9 Apr 2011 12:15:41 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3487A8FC0C;
	Sat,  9 Apr 2011 12:15:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39CFfxW013471;
	Sat, 9 Apr 2011 12:15:41 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39CFfd5013469;
	Sat, 9 Apr 2011 12:15:41 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091215.p39CFfd5013469@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 12:15:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220488 - stable/7/sys/netinet6
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 12:15:41 -0000

Author: bz
Date: Sat Apr  9 12:15:40 2011
New Revision: 220488
URL: http://svn.freebsd.org/changeset/base/220488

Log:
  MFC r219562:
  
    Make sure the locally cached value of rt->rt_gateway stays stable,
    even after dropping the reference and unlocking. Previously we
    have dereferenced a NULL pointer (after r121765).
    Simply unlocking after the block does not work either because of
    lock ordering (see r121765) and in addition we would still hold
    a pointer to something that might be gone by the time we access it.
    Thus take a copy of the value rather than just caching the pointer.
  
    Submitted by:	chenyl (netstar2008 126.com) (initial version)
  PR:		kern/151908

Modified:
  stable/7/sys/netinet6/nd6_nbr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet6/nd6_nbr.c
==============================================================================
--- stable/7/sys/netinet6/nd6_nbr.c	Sat Apr  9 12:11:19 2011	(r220487)
+++ stable/7/sys/netinet6/nd6_nbr.c	Sat Apr  9 12:15:40 2011	(r220488)
@@ -106,7 +106,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 	int anycast = 0, proxy = 0, tentative = 0;
 	int tlladdr;
 	union nd_opts ndopts;
-	struct sockaddr_dl *proxydl = NULL;
+	struct sockaddr_dl proxydl;
 	char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
 
 #ifndef PULLDOWN_TEST
@@ -235,18 +235,25 @@ nd6_ns_input(struct mbuf *m, int off, in
 		rt = rtalloc1((struct sockaddr *)&tsin6, 0, 0);
 		need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 &&
 		    rt->rt_gateway->sa_family == AF_LINK);
-		if (rt)
+		if (rt != NULL) {
+			/*
+			 * Make a copy while we can be sure that rt_gateway
+			 * is still stable before unlocking to avoid lock
+			 * order problems.  proxydl will only be used if
+			 * proxy will be set in the next block.
+			 */
+			if (need_proxy)
+				proxydl = *SDL(rt->rt_gateway);
 			RTFREE_LOCKED(rt);
+		}
 		if (need_proxy) {
 			/*
 			 * proxy NDP for single entry
 			 */
 			ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp,
 				IN6_IFF_NOTREADY|IN6_IFF_ANYCAST);
-			if (ifa) {
+			if (ifa)
 				proxy = 1;
-				proxydl = SDL(rt->rt_gateway);
-			}
 		}
 	}
 	if (ifa == NULL) {
@@ -320,7 +327,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 		nd6_na_output(ifp, &in6_all, &taddr6,
 		    ((anycast || proxy || !tlladdr) ? 0 : ND_NA_FLAG_OVERRIDE) |
 		    (ip6_forwarding ? ND_NA_FLAG_ROUTER : 0),
-		    tlladdr, (struct sockaddr *)proxydl);
+		    tlladdr, (struct sockaddr *)&proxydl);
 		goto freeit;
 	}
 
@@ -330,7 +337,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 	nd6_na_output(ifp, &saddr6, &taddr6,
 	    ((anycast || proxy || !tlladdr) ? 0 : ND_NA_FLAG_OVERRIDE) |
 	    (ip6_forwarding ? ND_NA_FLAG_ROUTER : 0) | ND_NA_FLAG_SOLICITED,
-	    tlladdr, (struct sockaddr *)proxydl);
+	    tlladdr, (struct sockaddr *)&proxydl);
  freeit:
 	m_freem(m);
 	return;

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 12:38:09 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8444106566B;
	Sat,  9 Apr 2011 12:38:09 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A2078FC0C;
	Sat,  9 Apr 2011 12:38:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39Cc9Ft014070;
	Sat, 9 Apr 2011 12:38:09 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39Cc9ko014066;
	Sat, 9 Apr 2011 12:38:09 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091238.p39Cc9ko014066@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 12:38:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220490 - stable/7/sys/netinet6
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 12:38:09 -0000

Author: bz
Date: Sat Apr  9 12:38:09 2011
New Revision: 220490
URL: http://svn.freebsd.org/changeset/base/220490

Log:
  MFC r219570:
  
    Push a possible "unbind" in some situation from in6_pcbsetport() to
    callers.  This also fixes a problem when the prison call could set
    the inp->in6p_laddr (laddr) and a following priv_check_cred() call
    would return an error and will allow us to merge the IPv4 and IPv6
    implementation.

Modified:
  stable/7/sys/netinet6/in6_pcb.c
  stable/7/sys/netinet6/in6_src.c
  stable/7/sys/netinet6/udp6_usrreq.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet6/in6_pcb.c
==============================================================================
--- stable/7/sys/netinet6/in6_pcb.c	Sat Apr  9 12:35:08 2011	(r220489)
+++ stable/7/sys/netinet6/in6_pcb.c	Sat Apr  9 12:38:09 2011	(r220490)
@@ -252,8 +252,11 @@ in6_pcbbind(register struct inpcb *inp, 
 		inp->in6p_laddr = sin6->sin6_addr;
 	}
 	if (lport == 0) {
-		if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0)
+		if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0) {
+			/* Undo an address bind that may have occurred. */
+			inp->in6p_laddr = in6addr_any;
 			return (error);
+		}
 	} else {
 		inp->inp_lport = lport;
 		if (in_pcbinshash(inp) != 0) {

Modified: stable/7/sys/netinet6/in6_src.c
==============================================================================
--- stable/7/sys/netinet6/in6_src.c	Sat Apr  9 12:35:08 2011	(r220489)
+++ stable/7/sys/netinet6/in6_src.c	Sat Apr  9 12:38:09 2011	(r220490)
@@ -858,11 +858,8 @@ in6_pcbsetport(struct in6_addr *laddr, s
 	count = last - first;
 
 	do {
-		if (count-- < 0) {	/* completely used? */
-			/* Undo an address bind that may have occurred. */
-			inp->in6p_laddr = in6addr_any;
+		if (count-- < 0)	/* completely used? */
 			return (EADDRNOTAVAIL);
-		}
 		++*lastport;
 		if (*lastport < first || *lastport > last)
 			*lastport = first;

Modified: stable/7/sys/netinet6/udp6_usrreq.c
==============================================================================
--- stable/7/sys/netinet6/udp6_usrreq.c	Sat Apr  9 12:35:08 2011	(r220489)
+++ stable/7/sys/netinet6/udp6_usrreq.c	Sat Apr  9 12:38:09 2011	(r220490)
@@ -597,8 +597,11 @@ udp6_output(struct inpcb *inp, struct mb
 			goto release;
 		}
 		if (inp->inp_lport == 0 &&
-		    (error = in6_pcbsetport(laddr, inp, td->td_ucred)) != 0)
+		    (error = in6_pcbsetport(laddr, inp, td->td_ucred)) != 0) {
+			/* Undo an address bind that may have occurred. */
+			inp->in6p_laddr = in6addr_any;
 			goto release;
+		}
 	} else {
 		if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
 			error = ENOTCONN;

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 12:56:14 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35C46106566B;
	Sat,  9 Apr 2011 12:56:14 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 084DD8FC16;
	Sat,  9 Apr 2011 12:56:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39CuDQ2014625;
	Sat, 9 Apr 2011 12:56:13 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39CuDxZ014624;
	Sat, 9 Apr 2011 12:56:13 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201104091256.p39CuDxZ014624@svn.freebsd.org>
From: "Bjoern A. Zeeb" 
Date: Sat, 9 Apr 2011 12:56:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220493 - stable/7
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 12:56:14 -0000

Author: bz
Date: Sat Apr  9 12:56:13 2011
New Revision: 220493
URL: http://svn.freebsd.org/changeset/base/220493

Log:
  MFC r217736:
  
    Add an svn:ignore property for _.{TARGETS}.* in the toplevel
    directory to ignore those file patters in svn status, add and import.

Modified:
Directory Properties:
  stable/7/   (props changed)

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Apr  9 19:07:45 2011
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 226FE1065686;
	Sat,  9 Apr 2011 19:07:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 117678FC14;
	Sat,  9 Apr 2011 19:07:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p39J7ioc022859;
	Sat, 9 Apr 2011 19:07:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39J7ijw022857;
	Sat, 9 Apr 2011 19:07:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201104091907.p39J7ijw022857@svn.freebsd.org>
From: Glen Barber 
Date: Sat, 9 Apr 2011 19:07:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220505 - stable/7/sbin/ifconfig
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 09 Apr 2011 19:07:45 -0000

Author: gjb (doc committer)
Date: Sat Apr  9 19:07:44 2011
New Revision: 220505
URL: http://svn.freebsd.org/changeset/base/220505

Log:
  MFC 220382:
  Correct 'list scan' description in the examples.  The previous description
  was incorrect - 'list scan' does not actually do a scan, but instead lists
  the results of the background 'scan' cache.

Modified:
  stable/7/sbin/ifconfig/ifconfig.8
Directory Properties:
  stable/7/sbin/ifconfig/   (props changed)

Modified: stable/7/sbin/ifconfig/ifconfig.8
==============================================================================
--- stable/7/sbin/ifconfig/ifconfig.8	Sat Apr  9 19:07:13 2011	(r220504)
+++ stable/7/sbin/ifconfig/ifconfig.8	Sat Apr  9 19:07:44 2011	(r220505)
@@ -1947,7 +1947,7 @@ Destroy the software network interface
 .Li gif1 :
 .Dl # ifconfig gif1 destroy
 .Pp
-Scan for wireless networks using
+Display available wireless networks using
 .Li ath0 :
 .Dl # ifconfig ath0 list scan
 .Sh DIAGNOSTICS