net: wireless: bcmdhd: Send cfg80211_disconnected() if fails to get rssi

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index a7b88f8e4af25002f3d08e73980ff4c9fb36c979..00cbfafb200c43ee7aed9e894f98d2574b35823a 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -2866,7 +2866,8 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                        if (memcmp(mac, curmacp, ETHER_ADDR_LEN)) {
                                WL_ERR(("Wrong Mac address: "MACSTR" != "MACSTR"\n",
                                        MAC2STR(mac), MAC2STR(curmacp)));
-                               return -ENOENT;
+                               err = -ENOENT;
+                               goto get_station_err;
                        }
                        /* Report the current tx rate */
                        err = wldev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate), false);
@@ -2886,13 +2887,16 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                                        sizeof(scb_val_t), false);
                                if (err) {
                                        WL_ERR(("Could not get rssi (%d)\n", err));
-                                       return err;
+                                       goto get_station_err;
                                }
                                rssi = dtoh32(scb_val.val);
                                sinfo->filled |= STATION_INFO_SIGNAL;
                                sinfo->signal = rssi;
                                WL_DBG(("RSSI %d dBm\n", rssi));
                        }
+get_station_err:
+               if (err)
+                       cfg80211_disconnected(dev, 0, NULL, 0, GFP_KERNEL);
        }
 
        return err;