--- linux-2.6.18.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-23 13:48:22.000000000 -0400
+++ linux-2.6.18.noarch/net/mac80211/ieee80211_sta.c	2007-07-23 13:50:30.000000000 -0400
@@ -2991,7 +2991,7 @@ struct sta_info * ieee80211_ibss_add_sta
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct sta_info *sta;
-	struct ieee80211_sub_if_data *sdata = NULL;
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
 	/* TODO: Could consider removing the least recently used entry and
 	 * allow new one to be added. */