Module Name:	src
Committed By:	dyoung
Date:		Wed Jul 28 08:12:50 UTC 2004

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

Log Message:
Vastly simplify ieee80211_ibss_merge, eliminating the needless
callbacks.  Change the reference IBSS-merge implementation in atw
to match.


To generate a diff of this commit:
cvs rdiff -r1.77 -r1.78 src/sys/dev/ic/atw.c
cvs rdiff -r1.31 -r1.32 src/sys/net80211/ieee80211_input.c
cvs rdiff -r1.4 -r1.5 src/sys/net80211/ieee80211_proto.h
cvs rdiff -r1.16 -r1.17 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.