diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
commit | 39c253ed7817bf477189a132b114303c9aa2c2d2 (patch) | |
tree | 194492ef6dd74a87e074698368cb1817624783fc /drivers/net/wireless/mwifiex/sta_event.c | |
parent | net: smc91x: dont't use SMC_outw for fixing up halfword-aligned data (diff) | |
parent | mwifiex: inform cfg80211 about disconnect for P2P client interface (diff) | |
download | linux-dev-39c253ed7817bf477189a132b114303c9aa2c2d2.tar.xz linux-dev-39c253ed7817bf477189a132b114303c9aa2c2d2.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_event.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/sta_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c index 8b057524b252..8c351f71f72f 100644 --- a/drivers/net/wireless/mwifiex/sta_event.c +++ b/drivers/net/wireless/mwifiex/sta_event.c @@ -118,7 +118,8 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code) dev_dbg(adapter->dev, "info: successfully disconnected from %pM: reason code %d\n", priv->cfg_bssid, reason_code); - if (priv->bss_mode == NL80211_IFTYPE_STATION) { + if (priv->bss_mode == NL80211_IFTYPE_STATION || + priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) { cfg80211_disconnected(priv->netdev, reason_code, NULL, 0, GFP_KERNEL); } |