Date: Fri, 30 Jan 2004 12:00:37 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 46220 for review Message-ID: <200401302000.i0UK0bvb050374@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46220 Change 46220 by sam@sam_ebb on 2004/01/30 11:59:45 o add include ieee80211_ioctl.h for per-station/node statistics block o add per-station statistics block o add per-station authentication mode o add per-station txpower o add flags field o replace power save field with a bit flag o shuffle members around to pack structure a bit; the old organization by function was too fragile Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#5 (text+ko) ==== @@ -35,6 +35,8 @@ #ifndef _NET80211_IEEE80211_NODE_H_ #define _NET80211_IEEE80211_NODE_H_ +#include <net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */ + #define IEEE80211_PSCAN_WAIT 5 /* passive scan wait */ #define IEEE80211_TRANS_WAIT 5 /* transition wait */ #define IEEE80211_INACT_WAIT 5 /* inactivity timer interval */ @@ -64,6 +66,22 @@ LIST_ENTRY(ieee80211_node) ni_hash; u_int ni_refcnt; u_int ni_scangen; /* gen# for timeout scan */ + u_int8_t ni_fragno; /* frag # of previous frame */ + u_int8_t ni_authmode; /* authentication algorithm */ + u_int16_t ni_flags; /* special-purpose state */ +#define IEEE80211_NODE_AUTH 0x0001 /* 802.1x auth complete */ +#define IEEE80211_NODE_WPA 0x0002 /* WPA enabled */ +#define IEEE80211_NODE_QOS 0x0004 /* QoS enabled */ +/* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */ +#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ + u_int16_t ni_associd; /* assoc response */ + u_int16_t ni_txpower; /* current transmit power */ + u_int32_t *ni_challenge; /* shared-key challenge */ + u_int16_t ni_txseq; /* seq to be transmitted */ + u_int16_t ni_rxseq; /* seq previous received */ + u_int16_t ni_rxseqs[16]; /* seq previous for qos frames*/ + u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ + struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */ /* hardware */ u_int32_t ni_rstamp; /* recv timestamp */ @@ -96,24 +114,12 @@ u_int16_t ni_timoffset; #endif - /* power saving mode */ - u_int8_t ni_pwrsave; + /* others */ struct ifqueue ni_savedq; /* packets queued for pspoll */ - - /* fragment reassembly */ - u_int8_t ni_fragno; /* frag # of previous frame */ - u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ - struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */ - - /* others */ - u_int16_t ni_associd; /* assoc response */ - u_int16_t ni_txseq; /* seq to be transmitted */ - u_int16_t ni_rxseq; /* seq previous received */ - u_int16_t ni_rxseqs[16]; /* seq previous for qos frames*/ int ni_fails; /* failure count to associate */ int ni_inact; /* inactivity mark count */ int ni_txrate; /* index to ni_rates[] */ - u_int32_t *ni_challenge; /* shared-key challenge */ + struct ieee80211_nodestats ni_stats; /* per-node statistics */ }; static __inline struct ieee80211_node *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401302000.i0UK0bvb050374>