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/wlan-ng | |
parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
parent | daf8cf608d57a0b9f22276036e420cc82cf6ab4f (diff) |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/staging/wlan-ng')
-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 76378397b76..fb466f4c92e 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) | |||
695 | 695 | ||
696 | void prism2_roamed(wlandevice_t *wlandev) | 696 | void prism2_roamed(wlandevice_t *wlandev) |
697 | { | 697 | { |
698 | cfg80211_roamed(wlandev->netdev, wlandev->bssid, | 698 | cfg80211_roamed(wlandev->netdev, NULL, wlandev->bssid, |
699 | NULL, 0, NULL, 0, GFP_KERNEL); | 699 | NULL, 0, NULL, 0, GFP_KERNEL); |
700 | } | 700 | } |
701 | 701 | ||