diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-02 19:18:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-02 19:18:50 -0800 |
| commit | bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b (patch) | |
| tree | d1a13eedc08cdc07aa488e77af08b84c50a07c46 /net/wireless | |
| parent | 2e9526b352061ee0fd2a1580a2e3a5af960dabc4 (diff) | |
| parent | c1f9a764cf47686b1f5a0cf87ada68d90056136a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/sme.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index ece378d531e..9f0b2800a9d 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -165,7 +165,7 @@ void cfg80211_conn_work(struct work_struct *work) struct cfg80211_registered_device *rdev = container_of(work, struct cfg80211_registered_device, conn_work); struct wireless_dev *wdev; - u8 bssid[ETH_ALEN]; + u8 bssid_buf[ETH_ALEN], *bssid = NULL; rtnl_lock(); cfg80211_lock_rdev(rdev); @@ -181,7 +181,10 @@ void cfg80211_conn_work(struct work_struct *work) wdev_unlock(wdev); continue; } - memcpy(bssid, wdev->conn->params.bssid, ETH_ALEN); + if (wdev->conn->params.bssid) { + memcpy(bssid_buf, wdev->conn->params.bssid, ETH_ALEN); + bssid = bssid_buf; + } if (cfg80211_conn_do_work(wdev)) __cfg80211_connect_result( wdev->netdev, bssid, |