svn commit: r192814 - projects/mesh11s/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Tue May 26 15:49:09 2009
New Revision: 192814
URL: http://svn.freebsd.org/changeset/base/192814

Log:
  Code cleanup in preparation for the first try at implemeting HWMP.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Tue May 26 15:33:34 2009	(r192813)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Tue May 26 15:49:09 2009	(r192814)
@@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$");
 
 /*
  * IEEE 802.11s Hybrid Wireless Mesh Protocol.
+ * 
+ * Based on March 2009, D3.0 802.11s draft spec.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
@@ -91,6 +93,12 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo
     &ieee80211_hwmp_rootmode, 0, "Root Mesh Point Node");
 #endif
 
+static void	hwmp_recv_preq(struct ieee80211vap *,
+    const struct ieee80211_meshpreq_ie *);
+static void	hwmp_recv_prep(struct ieee80211vap *,
+    const struct ieee80211_meshprep_ie *);
+static void	hwmp_recv_perr(struct ieee80211vap *,
+    const struct ieee80211_meshperr_ie *);
 
 void
 ieee80211_hwmp_recv_action(struct ieee80211vap *vap, struct ieee80211_node *ni,
@@ -152,6 +160,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
+		hwmp_recv_preq(vap, meshpreq);
 		/*
 		 * Is the peer trying to find us?
 		 */
@@ -180,8 +189,10 @@ ieee80211_hwmp_recv_action(struct ieee80
 		}
 		break;
 	case IEEE80211_ACTION_MESHPATH_REP:
+		hwmp_recv_prep(vap, meshprep);
 		break;
 	case IEEE80211_ACTION_MESHPATH_ERR:
+		hwmp_recv_perr(vap, meshperr);
 		break;
 	default:
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
@@ -203,7 +214,7 @@ ieee80211_hwmp_recv_action(struct ieee80
  * Add a Mesh Path Reply IE to a frame.
  */
 uint8_t *
-ieee80211_add_meshprep(uint8_t *frm, struct ieee80211_meshprep_ie *prep)
+ieee80211_add_meshprep(uint8_t *frm, const struct ieee80211_meshprep_ie *prep)
 {
 
 	*frm++ = IEEE80211_ELEMID_MESHPREP;
@@ -222,3 +233,22 @@ ieee80211_add_meshprep(uint8_t *frm, str
 
 	return frm;
 }
+
+static void
+hwmp_recv_preq(struct ieee80211vap *vap,
+    const struct ieee80211_meshpreq_ie *preq)
+{
+}
+
+static void
+hwmp_recv_prep(struct ieee80211vap *vap,
+    const struct ieee80211_meshprep_ie *prep)
+{
+
+}
+static void
+hwmp_recv_perr(struct ieee80211vap *vap,
+    const struct ieee80211_meshprep_ie *perr)
+{
+
+}