net: wireless: bcmdhd: Skip disassoc if country is not changed in country set

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

diff --git a/drivers/net/wireless/bcmdhd/wldev_common.c b/drivers/net/wireless/bcmdhd/wldev_common.c
index b01e4a2b8c993ea17344937dd6b59e5282452716..e69561e1bf34fc69a97390b71e9c58f4395ae3a3 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wldev_common.c
+++ b/drivers/net/wireless/bcmdhd/wldev_common.c
@@ -309,11 +309,19 @@ int wldev_set_country(
        if (!country_code)
                return error;
 
-       bzero(&scbval, sizeof(scb_val_t));
-       error = wldev_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t), 1);
-       if (error < 0) {
-               DHD_ERROR(("%s: set country failed due to Disassoc error\n", __FUNCTION__));
-               return error;
+       error = wldev_iovar_getbuf(dev, "country", &cspec, sizeof(cspec),
+                                       smbuf, sizeof(smbuf));
+       if (error < 0)
+               DHD_ERROR(("%s: get country failed = %d\n", __FUNCTION__, error));
+
+       if ((error < 0) ||
+           (strncmp(country_code, smbuf, WLC_CNTRY_BUF_SZ) != 0)) {
+               bzero(&scbval, sizeof(scb_val_t));
+               error = wldev_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t), 1);
+               if (error < 0) {
+                       DHD_ERROR(("%s: set country failed due to Disassoc error\n", __FUNCTION__));
+                       return error;
+               }
        }
        cspec.rev = -1;
        memcpy(cspec.country_abbrev, country_code, WLC_CNTRY_BUF_SZ);