From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 14:45:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A17416A4D0; Mon, 16 Feb 2004 14:45:28 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C1E0216A4DD
	for <perforce@freebsd.org>; Mon, 16 Feb 2004 14:45:27 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B496C43D1D
	for <perforce@freebsd.org>; Mon, 16 Feb 2004 14:45:27 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1GMjRGe069366
	for <perforce@freebsd.org>; Mon, 16 Feb 2004 14:45:27 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1GMjRAp069362
	for perforce@freebsd.org; Mon, 16 Feb 2004 14:45:27 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 16 Feb 2004 14:45:27 -0800 (PST)
Message-Id: <200402162245.i1GMjRAp069362@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 47059 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2004 22:45:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=47059

Change 47059 by sam@sam_ebb on 2004/02/16 14:45:03

	sync with madwifi

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#3 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
 #define _NET80211_IEEE80211_LINUX_H_
 
 /*
- * Locking definitions.
+ * Node locking definitions.
  */
 typedef rwlock_t ieee80211_node_lock_t;
 #define	IEEE80211_NODE_LOCK_INIT(_ic, _name)	rwlock_init(&(_ic)->ic_nodelock)
@@ -42,10 +42,28 @@
 #define	IEEE80211_NODE_LOCK_ASSERT(_ic) \
 	KASSERT(rwlock_is_locked(&(_ic)->ic_nodelock), ("node not locked!"))
 
+/*
+ * 802.1x state locking definitions.
+ */
+typedef spinlock_t eapol_node_lock_t;
+#define	EAPOL_LOCK_INIT(_ec, _name)	spin_lock_init(&(_ec)->ec_lock)
+#define	EAPOL_LOCK_DESTROY(_ec)
+#define	EAPOL_LOCK(_ec)			spin_lock_bh(&(_ec)->ec_lock)
+#define	EAPOL_UNLOCK(_ec)		spin_unlock_bh(&(_ec)->ec_lock)
+#define	EAPOL_LOCK_ASSERT(_ec) \
+	KASSERT(spin_is_locked(&(_ec)->ec_lock), ("node not locked!"))
+
 #define	M_LINK0		0x01		/* frame needs WEP encryption */
 
 /*
  * Node reference counting definitions.
+ *
+ * ieee80211_node_initref	initialize the reference count to 1
+ * ieee80211_node_incref	add a reference
+ * ieee80211_node_decref	remove a reference
+ * ieee80211_node_dectestref	remove a reference and return 1 if this
+ *				is the last reference, otherwise 0
+ * ieee80211_node_refcnt	reference count for printing (only)
  */
 #define ieee80211_node_initref(_ni) \
 	atomic_set(&(_ni)->ni_refcnt, 1)
@@ -55,6 +73,7 @@
 	atomic_dec(&(_ni)->ni_refcnt)
 #define	ieee80211_node_dectestref(_ni) \
 	atomic_dec_and_test(&(_ni)->ni_refcnt)
+#define	ieee80211_node_refcnt(_ni)	(_ni)->ni_refcnt.counter
 
 #define	le16toh(_x)	le16_to_cpu(_x)
 #define	htole16(_x)	cpu_to_le16(_x)