Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Malcolm Priestley and committed by
Greg Kroah-Hartman
1f171240 40c3ef9d

+3 -2
+3 -2
drivers/staging/vt6655/device_main.c
··· 1483 1483 } 1484 1484 } 1485 1485 1486 - if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) { 1487 - if (conf->assoc) { 1486 + if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) && 1487 + priv->op_mode != NL80211_IFTYPE_AP) { 1488 + if (conf->assoc && conf->beacon_rate) { 1488 1489 CARDbUpdateTSF(priv, conf->beacon_rate->hw_value, 1489 1490 conf->sync_tsf); 1490 1491