diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-25 17:28:55 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-25 17:28:55 (GMT) |
commit | 22e95ac87d62bdc65b8a694a23cd4a364689b013 (patch) | |
tree | 5ac900300ad1d4a8d8118545e3e971862de70ea4 /drivers/staging/wlan-ng/cfg80211.c | |
parent | 6b3678354647a653e669746c05765f05d2b90239 (diff) | |
parent | 31ec97d9cebac804814de298592648f7c18d8281 (diff) | |
download | linux-fsl-qoriq-22e95ac87d62bdc65b8a694a23cd4a364689b013.tar.xz |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/staging/wlan-ng/cfg80211.c')
-rw-r--r-- | drivers/staging/wlan-ng/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 7637839..fb466f4 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -695,7 +695,7 @@ void prism2_disconnected(wlandevice_t *wlandev) void prism2_roamed(wlandevice_t *wlandev) { - cfg80211_roamed(wlandev->netdev, wlandev->bssid, + cfg80211_roamed(wlandev->netdev, NULL, wlandev->bssid, NULL, 0, NULL, 0, GFP_KERNEL); } |