Subject: CVS commit: src/sys
To: None <>
From: David Young <>
List: source-changes
Date: 01/04/2005 00:56:52
Module Name:	src
Committed By:	dyoung
Date:		Tue Jan  4 00:56:52 UTC 2005

Modified Files:
	src/sys/dev/ic: ath.c atw.c
	src/sys/net80211: ieee80211_input.c ieee80211_node.c ieee80211_node.h

Log Message:
IBSS-merge clean-up, inspired by some Linux patches from Jon Anderson
( remove ieee80211_ibss_merge's TSFT argument.
Do the TSFT comparison in the drivers (ath, atw).  Remove a lot of
extraneous debug statements from ieee80211_ibss_merge.

Set the ieee80211_node's state to IEEE80211_STA_BSS after it's been
copied to the ic_bss, not before.

In struct ieee80211_node, make the ni_tstamp field a union of a
uint64_t and the 8 TSF octets so that it's easier to compare a
neighbor's TSF with the local TSF.

Log IBSS merges (Greg Troxel's suggestion).  Also log IBSS creation.
These are rare and important events that deserve to be logged.

To generate a diff of this commit:
cvs rdiff -r1.40 -r1.41 src/sys/dev/ic/ath.c
cvs rdiff -r1.81 -r1.82 src/sys/dev/ic/atw.c
cvs rdiff -r1.35 -r1.36 src/sys/net80211/ieee80211_input.c
cvs rdiff -r1.36 -r1.37 src/sys/net80211/ieee80211_node.c
cvs rdiff -r1.14 -r1.15 src/sys/net80211/ieee80211_node.h
cvs rdiff -r1.7 -r1.8 src/sys/net80211/ieee80211_proto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.