From 7c0cbd3bfa6e484eb2c94bbd7d3a3abb35bd40d0 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Mon, 1 Aug 2005 16:34:41 +0000 Subject: [PATCH] acm and ack are specified per-ac MFC after: 3 days --- sbin/ifconfig/ifieee80211.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index a32a2ab75055..5a9b84099a00 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -531,15 +531,25 @@ DECL_CMD_FUNC2(set80211txoplimit, ac, val) } static -DECL_CMD_FUNC(set80211acm, val, d) +DECL_CMD_FUNC(set80211acm, ac, d) { - set80211(s, IEEE80211_IOC_WME_ACM, d, WME_AC_BE, NULL); + set80211(s, IEEE80211_IOC_WME_ACM, 1, getac(ac), NULL); +} +static +DECL_CMD_FUNC(set80211noacm, ac, d) +{ + 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, d, WME_AC_BE, NULL); + set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 1, getac(ac), NULL); +} +static +DECL_CMD_FUNC(set80211noackpolicy, ac, d) +{ + set80211(s, IEEE80211_IOC_WME_ACKPOLICY, 0, getac(ac), NULL); } static @@ -1797,10 +1807,10 @@ static struct cmd ieee80211_cmds[] = { 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),