PERFORCE change 102823 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=102823

Change 102823 by sam at sam_ebb on 2006/07/31 03:16:08

	mismerge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 (text+ko) ====

@@ -203,7 +203,6 @@
 void	ieee80211_probe_curchan(struct ieee80211com *, int);
 void	ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *);
 void	ieee80211_reset_bss(struct ieee80211com *);
-void	ieee80211_end_scan(struct ieee80211com *);
 int	ieee80211_ibss_merge(struct ieee80211_node *);
 struct ieee80211_scan_entry;
 int	ieee80211_sta_join(struct ieee80211com *,