diff options
| author | Greg Kroah-Hartman | 2015-07-20 22:21:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-07-20 22:21:28 +0200 |
| commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
| tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/staging/vt6655/device_main.c | |
| parent | staging: dgap: remove duplicate code (diff) | |
| parent | Linux 4.2-rc3 (diff) | |
| download | kernel-qcow2-linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.gz kernel-qcow2-linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz kernel-qcow2-linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.zip | |
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index f7d70427d050..23ad16eb1d2a 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1411,7 +1411,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, priv->current_aid = conf->aid; - if (changed & BSS_CHANGED_BSSID) { + if (changed & BSS_CHANGED_BSSID && conf->bssid) { unsigned long flags; spin_lock_irqsave(&priv->lock, flags); |