From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  8 20:58:49 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
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 6C6501065672;
	Fri,  8 Oct 2010 20:58: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 42E7A8FC0A;
	Fri,  8 Oct 2010 20:58: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 o98Kwn5B014246;
	Fri, 8 Oct 2010 20:58:49 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o98KwnJq014244;
	Fri, 8 Oct 2010 20:58:49 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201010082058.o98KwnJq014244@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 8 Oct 2010 20:58:49 +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: r213631 - 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
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2010 20:58:49 -0000

Author: yongari
Date: Fri Oct  8 20:58:48 2010
New Revision: 213631
URL: http://svn.freebsd.org/changeset/base/213631

Log:
  MFC r212159,212161:
  r212159:
    Document tunable dev.sis.%unit.manual_pad
    While I'm here Xref vlan(4) as sis(4) supports VLAN oversized
    frames.
  
  r212161:
    Better wording.
  
    Submitted by:	jkim

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

Modified: stable/7/share/man/man4/sis.4
==============================================================================
--- stable/7/share/man/man4/sis.4	Fri Oct  8 20:58:05 2010	(r213630)
+++ stable/7/share/man/man4/sis.4	Fri Oct  8 20:58:48 2010	(r213631)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 28, 2006
+.Dd September 2, 2010
 .Dt SIS 4
 .Os
 .Sh NAME
@@ -145,6 +145,22 @@ SiS 630, 635, and 735 motherboard chipse
 .It
 Soekris Engineering net45xx, net48xx, lan1621, and lan1641
 .El
+.Sh SYSCTL VARIABLES
+The following variable is available as both
+.Xr sysctl 8
+variable and
+.Xr loader 8
+tunable:
+.Bl -tag -width indent
+.It Va dev.sis.%unit.manual_pad
+This variable controls how to pad short frames for DP83815/DP83816
+controllers on the specified device.
+DP83815/DP83816 controllers are known to pad 0xFF for short frames
+which is violation of RFC 1042.
+Set this variable to a non-zero value to let driver manually pad
+each short frame with zeros at the cost of extra CPU cycles.
+The default value is 0 to let hardware perform automatic padding.
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "sis%d: couldn't map ports/memory"
@@ -190,6 +206,7 @@ the card should be configured correctly.
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr polling 4 ,
+.Xr vlan 4 ,
 .Xr ifconfig 8
 .Rs
 .%T SiS 900 and SiS 7016 datasheets