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

[Rui Paulo]

Author: rpaulo
Date: Tue Jun  9 10:56:41 2009
New Revision: 193822
URL: http://svn.freebsd.org/changeset/base/193822

Log:
  HWMP seq numbers are 32 bit.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:17:22 2009	(r193821)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:56:41 2009	(r193822)
@@ -31,26 +31,29 @@
 #ifndef _NET80211_IEEE80211_HWMP_H_
 #define _NET80211_IEEE80211_HWMP_H_
 
+/* HWMP sequence numbers are 32 bit, so we can't use ieee80211_seq */
+typedef ieee80211_hwmp_seq uint32_t;
+
 /*
  * HWMP Forwarding Information table, part of each VAP.
  */
 struct ieee80211_hwmp_fi {
 	TAILQ_ENTRY(ieee80211_hwmp_fi) fi_next;
-	uint8_t		fi_dest[IEEE80211_ADDR_LEN];
-	ieee80211_seq	fi_seq;			/* HWMP sequence number */
-	ieee80211_seq	fi_preqid;		/* Last PREQ ID seen */
-	uint8_t		fi_nexthop[IEEE80211_ADDR_LEN];
-	uint32_t	fi_metric;		/* Path Metric */
-	uint32_t	fi_nhops;		/* Number of Hops */
-	uint8_t		fi_prevhop[IEEE80211_ADDR_LEN];
-	uint32_t	fi_lifetime;
+	uint8_t			fi_dest[IEEE80211_ADDR_LEN];
+	ieee80211_hwmp_seq	fi_seq;		/* HWMP sequence number */
+	ieee80211_hwmp_seq	fi_preqid;	/* Last PREQ ID seen */
+	uint8_t			fi_nexthop[IEEE80211_ADDR_LEN];
+	uint32_t		fi_metric;	/* Path Metric */
+	uint32_t		fi_nhops;	/* Number of Hops */
+	uint8_t			fi_prevhop[IEEE80211_ADDR_LEN];
+	uint32_t		fi_lifetime;
 };
 
 #ifdef _KERNEL
 struct ieee80211_hwmp_state {
 	TAILQ_HEAD(, ieee80211_hwmp_fi)	hs_head;
-	ieee80211_seq			hs_seq;	   /* next seq to be used */
-	ieee80211_seq			hs_preqid; /* next PREQ ID to be used */
+	ieee80211_hwmp_seq		hs_seq;	   /* next seq to be used */
+	ieee80211_hwmp_seq		hs_preqid; /* next PREQ ID to be used */
 	struct mtx			hs_lock;   /* lock for the fi table */
 };