Merge "qcacld-3.0: Fix NULL pointer dereferencing in p2p TX MGMT" into wlan-cld3.driver.lnx.1.1-dev

This commit is contained in:
Service qcabuildsw 2016-07-07 12:39:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 80b98532e8

View file

@ -1411,7 +1411,9 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
home_ch = goAdapter->sessionCtx.ap.operatingChannel;
}
if (ieee80211_frequency_to_channel(chan->center_freq) == home_ch) {
if (chan &&
(ieee80211_frequency_to_channel(chan->center_freq) ==
home_ch)) {
/* if adapter is already on requested ch, no need for ROC */
wait = 0;
hddLog(LOG1,
@ -1419,7 +1421,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
goto send_frame;
}
if (offchan && wait) {
if (offchan && wait && chan) {
int status;
rem_on_channel_request_type_t req_type = OFF_CHANNEL_ACTION_TX;
/* In case of P2P Client mode if we are already */