PERFORCE change 81297 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=81297

Change 81297 by sam at sam_ebb on 2005/08/01 17:50:39

	IFC

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#45 integrate

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#45 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.20 2005/07/26 06:00:33 sam Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.23 2005/08/01 16:34:41 sam Exp $
  */
 
 /*-
@@ -543,15 +543,25 @@
 }
 
 static
-DECL_CMD_FUNC(set80211acm, val, d)
+DECL_CMD_FUNC(set80211acm, ac, d)
+{
+	set80211(s, IEEE80211_IOC_WME_ACM, 1, getac(ac), NULL);
+}
+static
+DECL_CMD_FUNC(set80211noacm, ac, d)
 {
-	set80211(s, IEEE80211_IOC_WME_ACM, d, WME_AC_BE, NULL);
+	set80211(s, IEEE80211_IOC_WME_ACM, 0, getac(ac), NULL);
 }
 
 static
-DECL_CMD_FUNC(set80211ackpolicy, val, d)
+DECL_CMD_FUNC(set80211ackpolicy, ac, d)
+{
+	set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 1, getac(ac), NULL);
+}
+static
+DECL_CMD_FUNC(set80211noackpolicy, ac, d)
 {
-	set80211(s, IEEE80211_IOC_WME_ACKPOLICY, d, WME_AC_BE, NULL);
+	set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 0, getac(ac), NULL);
 }
 
 static
@@ -1943,10 +1953,10 @@
 	DEF_CMD_ARG2("cwmax",		set80211cwmax),
 	DEF_CMD_ARG2("aifs",		set80211aifs),
 	DEF_CMD_ARG2("txoplimit",	set80211txoplimit),
-	DEF_CMD("acm",		1,	set80211acm),
-	DEF_CMD("-acm",		0,	set80211acm),
-	DEF_CMD("ack",		1,	set80211ackpolicy),
-	DEF_CMD("-ack",		0,	set80211ackpolicy),
+	DEF_CMD_ARG("acm",		set80211acm),
+	DEF_CMD_ARG("-acm",		set80211noacm),
+	DEF_CMD_ARG("ack",		set80211ackpolicy),
+	DEF_CMD_ARG("-ack",		set80211noackpolicy),
 	DEF_CMD_ARG2("bss:cwmin",	set80211bsscwmin),
 	DEF_CMD_ARG2("bss:cwmax",	set80211bsscwmax),
 	DEF_CMD_ARG2("bss:aifs",	set80211bssaifs),