From owner-svn-src-projects@FreeBSD.ORG Fri Jul 3 14:43:29 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 ADB6710656B4; Fri, 3 Jul 2009 14:43:29 +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 9B44E8FC12; Fri, 3 Jul 2009 14:43:29 +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 n63EhTUv080536; Fri, 3 Jul 2009 14:43:29 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n63EhTWI080534; Fri, 3 Jul 2009 14:43:29 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200907031443.n63EhTWI080534@svn.freebsd.org> From: Rui Paulo Date: Fri, 3 Jul 2009 14:43:29 +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: r195308 - projects/mesh11s/sys/net80211 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, 03 Jul 2009 14:43:30 -0000 Author: rpaulo Date: Fri Jul 3 14:43:29 2009 New Revision: 195308 URL: http://svn.freebsd.org/changeset/base/195308 Log: Add HWMP case labels. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_action.c Modified: projects/mesh11s/sys/net80211/ieee80211_action.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 3 14:37:10 2009 (r195307) +++ projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 3 14:43:29 2009 (r195308) @@ -69,6 +69,10 @@ static ieee80211_send_action_func *meshp static ieee80211_send_action_func *meshlm_send_action[4] = { send_inval, send_inval, send_inval, send_inval, }; +static ieee80211_send_action_func *hwmp_send_action[8] = { + send_inval, send_inval, send_inval, send_inval, + send_inval, send_inval, send_inval, send_inval, +}; static ieee80211_send_action_func *vendor_send_action[8] = { send_inval, send_inval, send_inval, send_inval, send_inval, send_inval, send_inval, send_inval, @@ -99,6 +103,11 @@ ieee80211_send_action_register(int cat, break; meshlm_send_action[act] = f; return 0; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act > N(hwmp_send_action)) + break; + hwmp_send_action[act] = f; + return 0; case IEEE80211_ACTION_CAT_VENDOR: if (act >= N(vendor_send_action)) break; @@ -138,6 +147,10 @@ ieee80211_send_action(struct ieee80211_n if (act < N(meshlm_send_action)) f = meshlm_send_action[act]; break; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act < N(hwmp_send_action)) + f = hwmp_send_action[act]; + break; case IEEE80211_ACTION_CAT_VENDOR: if (act < N(vendor_send_action)) f = vendor_send_action[act]; @@ -169,6 +182,10 @@ static ieee80211_recv_action_func *meshp static ieee80211_recv_action_func *meshlm_recv_action[4] = { recv_inval, recv_inval, recv_inval, recv_inval, }; +static ieee80211_recv_action_func *hwmp_recv_action[8] = { + recv_inval, recv_inval, recv_inval, recv_inval, + recv_inval, recv_inval, recv_inval, recv_inval, +}; static ieee80211_recv_action_func *vendor_recv_action[8] = { recv_inval, recv_inval, recv_inval, recv_inval, recv_inval, recv_inval, recv_inval, recv_inval, @@ -199,6 +216,11 @@ ieee80211_recv_action_register(int cat, break; meshlm_recv_action[act] = f; return 0; + case IEEE80211_ACTION_CAT_MESHPATH: + if (act >= N(hwmp_recv_action)) + break; + hwmp_recv_action[act] = f; + return 0; case IEEE80211_ACTION_CAT_VENDOR: if (act >= N(vendor_recv_action)) break; @@ -241,6 +263,10 @@ ieee80211_recv_action(struct ieee80211_n if (ia->ia_action < N(meshlm_recv_action)) f = meshlm_recv_action[ia->ia_action]; break; + case IEEE80211_ACTION_CAT_MESHPATH: + if (ia->ia_action < N(hwmp_recv_action)) + f = hwmp_recv_action[ia->ia_action]; + break; case IEEE80211_ACTION_CAT_VENDOR: if (ia->ia_action < N(vendor_recv_action)) f = vendor_recv_action[ia->ia_action];