diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-05-21 18:22:56 -0700 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-05-01 23:35:19 +0200 |
| commit | ceac4d5a9892ab502402350f26854657e6655ec2 (patch) | |
| tree | 66d1bec9930710e289d42c2ecc1a52af03ad34c0 /drivers | |
| parent | 627a4c370d44dfa61eaf7c851603e4aea12cddea (diff) | |
| download | kernel_samsung_tuna-ceac4d5a9892ab502402350f26854657e6655ec2.zip kernel_samsung_tuna-ceac4d5a9892ab502402350f26854657e6655ec2.tar.gz kernel_samsung_tuna-ceac4d5a9892ab502402350f26854657e6655ec2.tar.bz2 | |
net: wireless: bcmdhd: Close p2p0 device in wl_down
Change-Id: I9e8404badf55c0e7a54144d7b5f1c5d80aa0cb4b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 47751c0..64e075d 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -9492,6 +9492,9 @@ static s32 __wl_cfg80211_down(struct wl_priv *wl) unsigned long flags; struct net_info *iter, *next; struct net_device *ndev = wl_to_prmry_ndev(wl); +#if defined(WL_CFG80211) && defined(WL_ENABLE_P2P_IF) + struct net_device *p2p_net = wl->p2p_net; +#endif /* WL_CFG80211 && WL_ENABLE_P2P_IF */ u32 bssidx = 0; WL_DBG(("In\n")); if (wl->pm_enable_work_on) { @@ -9542,6 +9545,10 @@ static s32 __wl_cfg80211_down(struct wl_priv *wl) } wl_to_prmry_ndev(wl)->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION; +#if defined(WL_CFG80211) && defined(WL_ENABLE_P2P_IF) + if (p2p_net) + dev_close(p2p_net); +#endif /* WL_CFG80211 && WL_ENABLE_P2P_IF */ DNGL_FUNC(dhd_cfg80211_down, (wl)); wl_flush_eq(wl); wl_link_down(wl); |