Date: Thu, 14 May 2009 10:43:57 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r192092 - projects/mesh11s/sys/net80211 Message-ID: <200905141043.n4EAhvDW088576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905141043.n4EAhvDW088576>