git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
drivers
/
staging
/
ath6kl
/
os
/
linux
/
cfg80211.c
diff --git
a/drivers/staging/ath6kl/os/linux/cfg80211.c
b/drivers/staging/ath6kl/os/linux/cfg80211.c
index
31d7ba8
..
77dfb40
100644
(file)
--- a/
drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/
drivers/staging/ath6kl/os/linux/cfg80211.c
@@
-587,7
+587,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);