diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2015-08-02 14:34:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-04 03:54:51 +0300 |
| commit | 1f17124006b65482d9084c01e252b59dbca8db8f (patch) | |
| tree | 3054d7d55a2f961f64f4c40cfaf37b67aeec6b8f /drivers/staging | |
| parent | 40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7 (diff) | |
| download | linux-1f17124006b65482d9084c01e252b59dbca8db8f.tar.xz | |
staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL
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 <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org> # v3.19+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index b0c8e235b982..69bdc8f29b59 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1483,8 +1483,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, } } - 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); |