Module Name:	src
Committed By:	dyoung
Date:		Sat Jul 24 23:53:49 UTC 2004

Modified Files:
	src/sys/dev/ic: atw.c atwvar.h
	src/sys/net80211: ieee80211_input.c ieee80211_proto.h ieee80211_var.h

Log Message:
Pull the IBSS merge logic out of atw and into net80211, since ath
will eventually share it.

In the IBSS merge logic, check conditions in a different order so
that they run faster in the common case---no merge.  Fix the
rate-limiting on the debug outputs (enabled by IFF_LINK0).


To generate a diff of this commit:
cvs rdiff -r1.75 -r1.76 src/sys/dev/ic/atw.c
cvs rdiff -r1.13 -r1.14 src/sys/dev/ic/atwvar.h
cvs rdiff -r1.30 -r1.31 src/sys/net80211/ieee80211_input.c
cvs rdiff -r1.3 -r1.4 src/sys/net80211/ieee80211_proto.h
cvs rdiff -r1.15 -r1.16 src/sys/net80211/ieee80211_var.h

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