diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /drivers/net/wireless/mwifiex/sta_event.c | |
parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
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); } |