diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/staging/ath6kl | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
parent | wireless: fix fatal kernel-doc error + warning in mac80211.h (diff) | |
download | linux-dev-31ec97d9cebac804814de298592648f7c18d8281.tar.xz linux-dev-31ec97d9cebac804814de298592648f7c18d8281.zip |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/staging/ath6kl')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index bcca39418f90..5bda24e26c0e 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c @@ -570,7 +570,7 @@ ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel, WLAN_STATUS_SUCCESS, GFP_KERNEL); } else { /* inform roam event to cfg80211 */ - cfg80211_roamed(ar->arNetDev, bssid, + cfg80211_roamed(ar->arNetDev, ibss_channel, bssid, assocReqIe, assocReqLen, assocRespIe, assocRespLen, GFP_KERNEL); |