diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:54:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:54:32 -0400 |
commit | 5419575e838cd2cd11a1b30449eb58decdf51f9f (patch) | |
tree | 36b20c033f58751fe11b71938738ad2cb39b20d0 /net/mac80211/ibss.c | |
parent | 0c49b69931a0001912bb4e48c415d33031ddb217 (diff) | |
parent | 64629b9d412544b0ed744405944fd6edf79d7e0d (diff) | |
download | op-kernel-dev-5419575e838cd2cd11a1b30449eb58decdf51f9f.zip op-kernel-dev-5419575e838cd2cd11a1b30449eb58decdf51f9f.tar.gz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 7c08251..5f3620f 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -278,7 +278,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta, if (auth && !sdata->u.ibss.auth_frame_registrations) { ibss_dbg(sdata, "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n", - sdata->vif.addr, sdata->u.ibss.bssid, addr); + sdata->vif.addr, addr, sdata->u.ibss.bssid); ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0, addr, sdata->u.ibss.bssid, NULL, 0, 0); } |