Merge tag 'mailbox-v5.4' of git://git.linaro.org/landing-teams/working/fujitsu/integr...

[linux.git] / net / wireless / wext-compat.c

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index d522787c735409adca94d315da27133f50a9dd37..7b6529d81c61e4e58f45c654740f26deccbeae19 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -7,6 +7,7 @@
  * we directly assign the wireless handlers of wireless interfaces.
  *
  * Copyright 2008-2009 Johannes Berg <johannes@sipsolutions.net>
+ * Copyright (C) 2019 Intel Corporation
  */
 
 #include <linux/export.h>
@@ -353,9 +354,6 @@ static int cfg80211_wext_siwretry(struct net_device *dev,
                changed |= WIPHY_PARAM_RETRY_SHORT;
        }
 
-       if (!changed)
-               return 0;
-
        err = rdev_set_wiphy_params(rdev, changed);
        if (err) {
                wdev->wiphy->retry_short = oshort;
@@ -867,8 +865,8 @@ static int cfg80211_wext_siwtxpower(struct net_device *dev,
                        }
                }
        } else {
-               rfkill_set_sw_state(rdev->rfkill, true);
-               schedule_work(&rdev->rfkill_sync);
+               if (rfkill_set_sw_state(rdev->rfkill, true))
+                       schedule_work(&rdev->rfkill_block);
                return 0;
        }