svn commit: r205295 - stable/8/sbin/ifconfig

[Pyun YongHyeon]

Author: yongari
Date: Thu Mar 18 19:10:03 2010
New Revision: 205295
URL: http://svn.freebsd.org/changeset/base/205295

Log:
  MFC r204150:
    Add TSO support on VLAN in fconfig(8).

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

Modified: stable/8/sbin/ifconfig/ifconfig.8
==============================================================================
--- stable/8/sbin/ifconfig/ifconfig.8	Thu Mar 18 19:04:04 2010	(r205294)
+++ stable/8/sbin/ifconfig/ifconfig.8	Thu Mar 18 19:10:03 2010	(r205295)
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd January 26, 2010
+.Dd February 20, 2010
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -408,20 +408,20 @@ they support in their capabilities.
 is a synonym for enabling all available WOL mechanisms.
 To disable WOL use
 .Fl wol .
-.It Cm vlanmtu , vlanhwtag, vlanhwfilter
+.It Cm vlanmtu , vlanhwtag, vlanhwfilter, vlanhwtso
 If the driver offers user-configurable VLAN support, enable
-reception of extended frames, tag processing in hardware, or
-frame filtering in hardware,
+reception of extended frames, tag processing in hardware,
+frame filtering in hardware, or TSO on VLAN,
 respectively.
 Note that this must be issued on a physical interface associated with
 .Xr vlan 4 ,
 not on a
 .Xr vlan 4
 interface itself.
-.It Fl vlanmtu , vlanhwtag, vlanhwfilter
+.It Fl vlanmtu , vlanhwtag, vlanhwfilter, vlanhwtso
 If the driver offers user-configurable VLAN support, disable
-reception of extended frames, tag processing in hardware, or
-frame filtering in hardware,
+reception of extended frames, tag processing in hardware,
+frame filtering in hardware, or TSO on VLAN,
 respectively.
 .It Cm vnet Ar jail
 Move the interface to the

Modified: stable/8/sbin/ifconfig/ifconfig.c
==============================================================================
--- stable/8/sbin/ifconfig/ifconfig.c	Thu Mar 18 19:04:04 2010	(r205294)
+++ stable/8/sbin/ifconfig/ifconfig.c	Thu Mar 18 19:10:03 2010	(r205295)
@@ -865,7 +865,7 @@ unsetifdescr(const char *val, int value,
 #define	IFCAPBITS \
 "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \
 "\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \
-"\21VLAN_HWFILTER"
+"\21VLAN_HWFILTER\23VLAN_HWTSO"
 
 /*
  * Print the status of the interface.  If an address family was

Modified: stable/8/sbin/ifconfig/ifvlan.c
==============================================================================
--- stable/8/sbin/ifconfig/ifvlan.c	Thu Mar 18 19:04:04 2010	(r205294)
+++ stable/8/sbin/ifconfig/ifvlan.c	Thu Mar 18 19:10:03 2010	(r205295)
@@ -181,6 +181,8 @@ static struct cmd vlan_cmds[] = {
 	DEF_CMD("-vlanhwtag",	-IFCAP_VLAN_HWTAGGING,	setifcap),
 	DEF_CMD("vlanhwfilter",	IFCAP_VLAN_HWFILTER,	setifcap),
 	DEF_CMD("-vlanhwfilter", -IFCAP_VLAN_HWFILTER,	setifcap),
+	DEF_CMD("-vlanhwtso",	-IFCAP_VLAN_HWTSO,	setifcap),
+	DEF_CMD("vlanhwtso",	IFCAP_VLAN_HWTSO,	setifcap),
 };
 static struct afswtch af_vlan = {
 	.af_name	= "af_vlan",