From cd2aac54efacf6b8fa950462aa5000bd845904c7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 31 Jan 2012 11:45:15 +0300 Subject: [PATCH] --- yaml --- r: 289027 b: refs/heads/master c: 2e254212942e483eba4753830268045ac87ea224 h: refs/heads/master i: 289025: 50d4e9efff25ace6b48265543899f09eb59fa0ce 289023: 4a6edb20c2fa16090eda4311cfb14dbf9a127b0d v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/prism2mgmt.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 016540c1ed0c..d665ffe0cd05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 881763361e8283a6d33d5a30ac6edc36e7dc6d44 +refs/heads/master: 2e254212942e483eba4753830268045ac87ea224 diff --git a/trunk/drivers/staging/wlan-ng/prism2mgmt.c b/trunk/drivers/staging/wlan-ng/prism2mgmt.c index 6675c8226cef..c3bb05dd744f 100644 --- a/trunk/drivers/staging/wlan-ng/prism2mgmt.c +++ b/trunk/drivers/staging/wlan-ng/prism2mgmt.c @@ -406,6 +406,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) /* SSID */ req->ssid.status = P80211ENUM_msgitem_status_data_ok; req->ssid.data.len = le16_to_cpu(item->ssid.len); + req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_BSSID_LEN); memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len); /* supported rates */