From 9055c25cc899c03f0b2fcc6c7734bd79b281363b Mon Sep 17 00:00:00 2001 From: br1 Date: Wed, 12 Dec 2007 11:29:19 +0000 Subject: [PATCH] fix two more instances of using the wrong bssid in IBSS mode. there are more places where we could use vap->iv_bss->ni_bssid instead of ni->ni_bssid but i'm not sure about the other ones. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3036 0192ed92-7a03-0410-a25b-9323aeb14dbd --- net80211/ieee80211_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net80211/ieee80211_output.c b/net80211/ieee80211_output.c index 5f73877..7aecdfe 100644 --- a/net80211/ieee80211_output.c +++ b/net80211/ieee80211_output.c @@ -478,7 +478,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) skb_push(skb, sizeof(struct ieee80211_frame)); ieee80211_send_setup(vap, ni, wh, IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA, - vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + vap->iv_myaddr, ni->ni_macaddr, vap->iv_bss->ni_bssid); /* NB: power management bit is never sent by an AP */ if ((IEEE80211_VAP_IS_SLEEPING(ni->ni_vap)) && vap->iv_opmode != IEEE80211_M_HOSTAP && @@ -533,7 +533,7 @@ ieee80211_send_qosnulldata(struct ieee80211_node *ni, int ac) IEEE80211_FC0_TYPE_DATA, vap->iv_myaddr, /* SA */ ni->ni_macaddr, /* DA */ - ni->ni_bssid); + vap->iv_bss->ni_bssid); qwh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS_NULL;