From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 10:56:41 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 CC7C4106566C;
	Tue,  9 Jun 2009 10:56:41 +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 BBBB58FC18;
	Tue,  9 Jun 2009 10:56:41 +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 n59AufR0068380;
	Tue, 9 Jun 2009 10:56:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59Auffv068379;
	Tue, 9 Jun 2009 10:56:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091056.n59Auffv068379@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 10:56:41 +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: r193822 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 10:56:42 -0000

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 */
 };