Module Name:	src
Committed By:	dyoung
Date:		Thu Dec 29 21:40:41 UTC 2005

Modified Files:
	src/sys/dev/ic: atw.c

Log Message:
Adapt atw(4) to the new IBSS merge idiom, where ieee80211_ibss_merge()
does not return ENETRESET to indicate the station should adopt a
new BSSID, but it triggers a RUN->RUN transition, instead.


To generate a diff of this commit:
cvs rdiff -r1.96 -r1.97 src/sys/dev/ic/atw.c

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