diff options
| author | Om Prakash Singh <omp@nvidia.com> | 2014-04-25 18:47:32 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-06-03 05:19:01 -0700 |
| commit | 96e09205d62d9beb8a112109922ed0cbae35df19 (patch) | |
| tree | 907b8bd93c23507df4e1424b6d7eac59b9a521b9 /drivers | |
| parent | 7c7de221c379f99e2bbae3af51628e8b8610335f (diff) | |
net: wireless: bcmdhd: fix call from ndev_to_wdev
dhd_idx2net can return NULL. ndev_to_wdev needs valid input
Bug 1507452
Change-Id: I2291f0a1a71b90dc799f93169ccf7eec63479f18
Signed-off-by: Om Prakash Singh <omp@nvidia.com>
Reviewed-on: http://git-master/r/401796
(cherry picked from commit 8263b665ebb294ae5e51078a20a5ab94b9100fd9)
Reviewed-on: http://git-master/r/417395
GVS: Gerrit_Virtual_Submit
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Tested-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: Mohan Thadikamalla <mohant@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 34dfc4039e85..cfc64f1b069e 100755 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -9632,6 +9632,7 @@ static s32 wl_event_handler(void *data) struct wl_event_q *e; tsk_ctl_t *tsk = (tsk_ctl_t *)data; bcm_struct_cfgdev *cfgdev = NULL; + struct net_device *netdev; wl = (struct wl_priv *)tsk->parent; @@ -9651,8 +9652,9 @@ static s32 wl_event_handler(void *data) if ((wl_is_p2p_event(e) == TRUE) && (wl->p2p_wdev)) { cfgdev = wl_to_p2p_wdev(wl); } else { - cfgdev = ndev_to_wdev(dhd_idx2net((struct dhd_pub *)(wl->pub), - e->emsg.ifidx)); + netdev = dhd_idx2net((struct dhd_pub *)(wl->pub), e->emsg.ifidx); + if (netdev) + cfgdev = ndev_to_wdev(netdev); } #elif defined(WL_ENABLE_P2P_IF) if ((wl_is_p2p_event(e) == TRUE) && (wl->p2p_net)) { |