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

[Pyun YongHyeon]

Author: yongari
Date: Mon Mar 22 19:36:47 2010
New Revision: 205459
URL: http://svn.freebsd.org/changeset/base/205459

Log:
  MFC r182414:
    Add support in ifconfig to control the vlan hardware filter feature.

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:04:02 2010	(r205458)
+++ stable/7/sbin/ifconfig/ifconfig.8	Mon Mar 22 19:36:47 2010	(r205459)
@@ -402,18 +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
+.It Cm vlanmtu , vlanhwtag, vlanhwfilter
 If the driver offers user-configurable VLAN support, enable
-reception of extended frames or tag processing in hardware,
+reception of extended frames, tag processing in hardware, or
+frame filtering in hardware,
 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
+.It Fl vlanmtu , vlanhwtag, vlanhwfilter
 If the driver offers user-configurable VLAN support, disable
-reception of extended frames or tag processing in hardware,
+reception of extended frames, tag processing in hardware, or
+frame filtering in hardware,
 respectively.
 .It Cm polling
 Turn on

Modified: stable/7/sbin/ifconfig/ifconfig.c
==============================================================================
--- stable/7/sbin/ifconfig/ifconfig.c	Mon Mar 22 19:04:02 2010	(r205458)
+++ stable/7/sbin/ifconfig/ifconfig.c	Mon Mar 22 19:36:47 2010	(r205459)
@@ -777,7 +777,8 @@ 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"
+"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \
+"\21VLAN_HWFILTER"
 
 /*
  * 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:04:02 2010	(r205458)
+++ stable/7/sbin/ifconfig/ifvlan.c	Mon Mar 22 19:36:47 2010	(r205459)
@@ -180,6 +180,8 @@ static struct cmd vlan_cmds[] = {
 	DEF_CMD("-vlanmtu",	-IFCAP_VLAN_MTU,	setifcap),
 	DEF_CMD("vlanhwtag",	IFCAP_VLAN_HWTAGGING,	setifcap),
 	DEF_CMD("-vlanhwtag",	-IFCAP_VLAN_HWTAGGING,	setifcap),
+	DEF_CMD("vlanhwfilter",	IFCAP_VLAN_HWFILTER,	setifcap),
+	DEF_CMD("-vlanhwfilter", -IFCAP_VLAN_HWFILTER,	setifcap),
 };
 static struct afswtch af_vlan = {
 	.af_name	= "af_vlan",