From 9179283ca45ce4db3881925e6258f6eb24e65867 Mon Sep 17 00:00:00 2001 From: Emil Goode Date: Tue, 18 Sep 2012 18:04:07 +0200 Subject: [PATCH] --- yaml --- r: 325410 b: refs/heads/master c: 5d5d7c3b938d0c365e65180f2b9d6ffad4973cee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/cfg80211.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ff76f479b23..09fe05109e08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d9562a6ed5389cd92deafa3e357e197b1ff136d +refs/heads/master: 5d5d7c3b938d0c365e65180f2b9d6ffad4973cee diff --git a/trunk/drivers/staging/wlan-ng/cfg80211.c b/trunk/drivers/staging/wlan-ng/cfg80211.c index 0970127344e6..57a2b058e3de 100644 --- a/trunk/drivers/staging/wlan-ng/cfg80211.c +++ b/trunk/drivers/staging/wlan-ng/cfg80211.c @@ -329,9 +329,9 @@ int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, int prism2_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) { - struct net_device *dev = request->wdev->netdev; + struct net_device *dev; struct prism2_wiphy_private *priv = wiphy_priv(wiphy); - wlandevice_t *wlandev = dev->ml_priv; + wlandevice_t *wlandev; struct p80211msg_dot11req_scan msg1; struct p80211msg_dot11req_scan_results msg2; struct cfg80211_bss *bss; @@ -345,6 +345,9 @@ int prism2_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) if (!request) return -EINVAL; + dev = request->wdev->netdev; + wlandev = dev->ml_priv; + if (priv->scan_request && priv->scan_request != request) return -EBUSY;