Date: Mon, 30 Jan 2006 21:24:19 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 90716 for review Message-ID: <200601302124.k0ULOJte052388@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=90716 Change 90716 by sam@sam_ebb on 2006/01/30 21:23:39 fix mismerge Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 (text+ko) ==== @@ -1063,8 +1063,6 @@ callout_stop(&ic->ic_mgtsend); /* XXX callout_drain */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(ic); /* background scan */ - if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) - callout_stop(&ic->ic_swbmiss); ni = ic->ic_bss; /* NB: no reference held */ if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) callout_stop(&ic->ic_swbmiss);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601302124.k0ULOJte052388>