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

[Rui Paulo]

Author: rpaulo
Date: Tue Jun  9 11:21:36 2009
New Revision: 193823
URL: http://svn.freebsd.org/changeset/base/193823

Log:
  Properly implement mesh sequence numbers.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h
  projects/mesh11s/sys/net80211/ieee80211_output.c
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -32,7 +32,7 @@
 #define _NET80211_IEEE80211_HWMP_H_
 
 /* HWMP sequence numbers are 32 bit, so we can't use ieee80211_seq */
-typedef ieee80211_hwmp_seq uint32_t;
+typedef uint32_t ieee80211_hwmp_seq;
 
 /*
  * HWMP Forwarding Information table, part of each VAP.

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 11:21:36 2009	(r193823)
@@ -120,6 +120,7 @@ static void
 mesh_vdetach(struct ieee80211vap *vap)
 {
 	ieee80211_hwmp_vdetach(vap);
+	vap->iv_meshseq = 0;
 }
 
 static void
@@ -1274,14 +1275,6 @@ ieee80211_create_mbss(struct ieee80211va
 	ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
 }
 
-uint32_t
-ieee80211_mesh_getseq(void)
-{
-	static uint32_t seq = 0;
-	
-	return seq++;
-}
-
 static int
 mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -387,6 +387,5 @@ uint32_t	ieee80211_airtime_calc(struct i
 uint8_t *	ieee80211_add_meshlmetric(uint8_t *, uint32_t);
 void		ieee80211_create_mbss(struct ieee80211vap *, struct
 		    ieee80211_channel *);
-uint32_t	ieee80211_mesh_getseq(void);
 #endif /* _KERNEL */
 #endif /* !_NET80211_IEEE80211_MESH_H_ */

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 11:21:36 2009	(r193823)
@@ -1250,6 +1250,7 @@ ieee80211_encap(struct ieee80211vap *vap
 	struct ieee80211_meshcntl_ae11 *mc;
 	uint32_t seq;
 	uint8_t *qos;
+	extern uint32_t ieee80211_mesh_ttl;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The
@@ -1473,8 +1474,8 @@ ieee80211_encap(struct ieee80211vap *vap
 			KASSERT(0, ("meshae %d", meshae));
 			break;
 		}
-		mc->mc_ttl = 160;
-		seq = ieee80211_mesh_getseq();
+		mc->mc_ttl = ieee80211_mesh_ttl;
+		seq = vap->iv_meshseq++;
 		mc->mc_seq[0] = seq & 0xff;
 		mc->mc_seq[1] = (seq >> 8) & 0xff;
 		mc->mc_seq[2] = (seq >> 16) & 0xff;

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -395,6 +395,7 @@ struct ieee80211vap {
 	int			iv_csa_count;	/* count for doing CSA */
 	int			iv_meshidlen;
 	uint8_t			iv_meshid[IEEE80211_MESHID_LEN];
+	uint32_t		iv_meshseq;
 
 	struct ieee80211_node	*iv_bss;	/* information for this node */
 	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];