svn commit: r205460 - stable/7/sbin/ifconfig

[Pyun YongHyeon]

Author: yongari
Date: Mon Mar 22 19:50:33 2010
New Revision: 205460
URL: http://svn.freebsd.org/changeset/base/205460

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

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

Modified: stable/7/sbin/ifconfig/ifconfig.8
==============================================================================
--- stable/7/sbin/ifconfig/ifconfig.8	Mon Mar 22 19:36:47 2010	(r205459)
+++ stable/7/sbin/ifconfig/ifconfig.8	Mon Mar 22 19:50:33 2010	(r205460)
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd October 19, 2008
+.Dd February 20, 2010
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -402,20 +402,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 polling
 Turn on

Modified: stable/7/sbin/ifconfig/ifconfig.c
==============================================================================
--- stable/7/sbin/ifconfig/ifconfig.c	Mon Mar 22 19:36:47 2010	(r205459)
+++ stable/7/sbin/ifconfig/ifconfig.c	Mon Mar 22 19:50:33 2010	(r205460)
@@ -778,7 +778,7 @@ setifname(const char *val, int dummy __u
 #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/7/sbin/ifconfig/ifvlan.c
==============================================================================
--- stable/7/sbin/ifconfig/ifvlan.c	Mon Mar 22 19:36:47 2010	(r205459)
+++ stable/7/sbin/ifconfig/ifvlan.c	Mon Mar 22 19:50:33 2010	(r205460)
@@ -182,6 +182,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",