From owner-svn-src-projects@FreeBSD.ORG Fri Jun 26 18:38:22 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A93C1065670; Fri, 26 Jun 2009 18:38:22 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 196D48FC08; Fri, 26 Jun 2009 18:38:22 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5QIcLig094607; Fri, 26 Jun 2009 18:38:22 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QIcLV7094605; Fri, 26 Jun 2009 18:38:21 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906261838.n5QIcLV7094605@svn.freebsd.org> From: Rui Paulo Date: Fri, 26 Jun 2009 18:38:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195068 - projects/mesh11s/sbin/ifconfig X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2009 18:38:22 -0000 Author: rpaulo Date: Fri Jun 26 18:38:21 2009 New Revision: 195068 URL: http://svn.freebsd.org/changeset/base/195068 Log: Get/set maxhops HWMP setting. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/mesh11s/sbin/ifconfig/ifieee80211.c Fri Jun 26 18:37:42 2009 (r195067) +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Fri Jun 26 18:38:21 2009 (r195068) @@ -1323,6 +1323,12 @@ DECL_CMD_FUNC(set80211hwmprootmode, val, set80211(s, IEEE80211_IOC_HWMP_ROOTMODE, atoi(val), 0, NULL); } +static +DECL_CMD_FUNC(set80211hwmpmaxhops, val, d) +{ + set80211(s, IEEE80211_IOC_HWMP_MAXHOPS, atoi(val), 0, NULL); +} + static void set80211pureg(const char *val, int d, int s, const struct afswtch *rafp) { @@ -4802,22 +4808,25 @@ end: if (get80211val(s, IEEE80211_IOC_HWMP_ROOTMODE, &val) != -1) { switch (val) { case IEEE80211_HWMP_ROOTMODE_DISABLED: - LINE_CHECK("rootmode DISABLED"); + LINE_CHECK("hwmprootmode DISABLED"); break; case IEEE80211_HWMP_ROOTMODE_NORMAL: - LINE_CHECK("rootmode NORMAL"); + LINE_CHECK("hwmprootmode NORMAL"); break; case IEEE80211_HWMP_ROOTMODE_PROACTIVE: - LINE_CHECK("rootmode PROACTIVE"); + LINE_CHECK("hwmprootmode PROACTIVE"); break; case IEEE80211_HWMP_ROOTMODE_RANN: - LINE_CHECK("rootmode RANN"); + LINE_CHECK("hwmprootmode RANN"); break; default: - LINE_CHECK("rootmode UNKNOWN(%d)", val); + LINE_CHECK("hwmprootmode UNKNOWN(%d)", val); break; } } + if (get80211val(s, IEEE80211_IOC_HWMP_MAXHOPS, &val) != -1) { + LINE_CHECK("hwmpmaxhops %u", val); + } } LINE_BREAK(); @@ -5224,7 +5233,8 @@ static struct cmd ieee80211_cmds[] = { DEF_CMD("-meshforward", 0, set80211meshforward), DEF_CMD("meshpeering", 1, set80211meshpeering), DEF_CMD("-meshpeering", 0, set80211meshpeering), - DEF_CMD_ARG("rootmode", set80211hwmprootmode), + DEF_CMD_ARG("hwmprootmode", set80211hwmprootmode), + DEF_CMD_ARG("hwmpmaxhops", set80211hwmpmaxhops), /* vap cloning support */ DEF_CLONE_CMD_ARG("wlanaddr", set80211clone_wlanaddr),