From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59925 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932293AbbHNCZh (ORCPT ); Thu, 13 Aug 2015 22:25:37 -0400 Subject: Patch "staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL" has been added to the 4.1-stable tree To: tvboxspy@gmail.com, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 13 Aug 2015 19:25:37 -0700 Message-ID: <143951913629110@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: staging-vt6655-vnt_bss_info_changed-check-conf-beacon_rate-is-not-null.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 1f17124006b65482d9084c01e252b59dbca8db8f Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 2 Aug 2015 12:34:46 +0100 Subject: staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL From: Malcolm Priestley commit 1f17124006b65482d9084c01e252b59dbca8db8f upstream. conf->beacon_rate can be NULL on association. So check conf->beacon_rate BSS_CHANGED_BEACON_INFO needs to flagged in changed as the beacon_rate will appear later. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1486,8 +1486,9 @@ static void vnt_bss_info_changed(struct } } - if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) { - if (conf->assoc) { + if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) && + priv->op_mode != NL80211_IFTYPE_AP) { + if (conf->assoc && conf->beacon_rate) { CARDbUpdateTSF(priv, conf->beacon_rate->hw_value, conf->sync_tsf); Patches currently in stable-queue which might be from tvboxspy@gmail.com are queue-4.1/staging-vt6655-vnt_bss_info_changed-check-conf-beacon_rate-is-not-null.patch