--- linux-2.6.18.noarch/net/mac80211/main.c.orig	2008-11-23 15:20:40.000000000 -0500
+++ linux-2.6.18.noarch/net/mac80211/main.c	2008-11-23 15:22:07.000000000 -0500
@@ -509,9 +509,11 @@ static int ieee80211_stop(struct net_dev
 		ieee80211_configure_filter(local);
 		netif_tx_unlock_bh(local->mdev);
 		break;
-	case IEEE80211_IF_TYPE_MESH_POINT:
 	case IEEE80211_IF_TYPE_STA:
 	case IEEE80211_IF_TYPE_IBSS:
+		/* Announce that we are leaving the network. */
+		ieee80211_sta_deauthenticate(dev, WLAN_REASON_DEAUTH_LEAVING);
+	case IEEE80211_IF_TYPE_MESH_POINT:
 		sdata->u.sta.state = IEEE80211_DISABLED;
 		memset(sdata->u.sta.bssid, 0, ETH_ALEN);
 		del_timer_sync(&sdata->u.sta.timer);