From owner-svn-src-projects@FreeBSD.ORG Thu May 14 10:43:57 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 F1DAA106564A; Thu, 14 May 2009 10:43:57 +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 C8C6B8FC13; Thu, 14 May 2009 10:43:57 +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 n4EAhvHX088578; Thu, 14 May 2009 10:43:57 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4EAhvDW088576; Thu, 14 May 2009 10:43:57 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905141043.n4EAhvDW088576@svn.freebsd.org> From: Rui Paulo Date: Thu, 14 May 2009 10:43:57 +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: r192092 - 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: Thu, 14 May 2009 10:43:58 -0000 Author: rpaulo Date: Thu May 14 10:43:57 2009 New Revision: 192092 URL: http://svn.freebsd.org/changeset/base/192092 Log: * remove non usable code * mark mesh nodes qos capable. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_node.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 14 10:42:59 2009 (r192091) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 14 10:43:57 2009 (r192092) @@ -488,6 +488,10 @@ mesh_recv_mgmt(struct ieee80211_node *ni */ ni = ieee80211_add_neighbor(vap, wh, &scan); /* + * Mesh nodes must be QoS capable. + */ + ni->ni_flags |= IEEE80211_NODE_QOS; + /* * Try to peer with this node. */ get_random_bytes(&ni->ni_plid, 2); @@ -938,25 +942,6 @@ mesh_verify_meshconf(struct ieee80211vap } /* - * Parse a MESH ID ie on station join. - */ -void -ieee80211_parse_meshid(struct ieee80211_node *ni, const uint8_t *ie) -{ - struct ieee80211vap *vap = ni->ni_vap; - - if (vap->iv_caps & IEEE80211_C_MBSS) { - /*const struct ieee80211_meshid_ie *meshid = - (const struct ieee80211_meshid_ie *)ie;*/ - - /* - * Mesh STAs are QoS stations, so QoS is not optional. - */ - ni->ni_flags |= IEEE80211_NODE_QOS; - } -} - -/* * Add a MESH ID element to a frame. */ uint8_t * Modified: projects/mesh11s/sys/net80211/ieee80211_node.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.c Thu May 14 10:42:59 2009 (r192091) +++ projects/mesh11s/sys/net80211/ieee80211_node.c Thu May 14 10:43:57 2009 (r192092) @@ -785,8 +785,6 @@ ieee80211_sta_join(struct ieee80211vap * if (ni->ni_ies.tdma_ie != NULL) ieee80211_parse_tdma(ni, ni->ni_ies.tdma_ie); #endif - if (ni->ni_ies.meshid_ie != NULL) - ieee80211_parse_meshid(ni, ni->ni_ies.meshid_ie); } vap->iv_dtim_period = se->se_dtimperiod;