netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 06d050da0d94720cb40d3ad28425b06da22b3e89..71b52f85cc61166451e469c10cd82e9bb167ed7c 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1882,6 +1882,18 @@ static void reg_set_request_processed(void)
        bool need_more_processing = false;
        struct regulatory_request *lr = get_last_request();
 
+#ifdef CONFIG_CFG80211_REG_NOT_UPDATED
+       /*
+       * SAMSUNG FIX : Regulatory Configuration was update
+       * via WIPHY_FLAG_CUSTOM_REGULATORY of Wi-Fi Driver.
+       * Regulation should not updated even if device found other country Access Point Beacon once
+       * since device should find around other Access Points.
+       * 2014.1.8 Convergence Wi-Fi Core
+       */
+       printk("regulatory is not upadted via %s.\n", __func__);
+       return;
+#endif
+
        lr->processed = true;
 
        spin_lock(&reg_requests_lock);
@@ -2342,6 +2354,20 @@ static void reg_todo(struct work_struct *work)
 
 static void queue_regulatory_request(struct regulatory_request *request)
 {
+#ifdef CONFIG_CFG80211_REG_NOT_UPDATED
+       /*
+       * SAMSUNG FIX : Regulatory Configuration was update
+       * via WIPHY_FLAG_CUSTOM_REGULATORY of Wi-Fi Driver.
+       * Regulation should not updated even if device found other country Access Point Beacon once
+       * since device should find around other Access Points.
+       * 2014.1.8 Convergence Wi-Fi Core
+       */
+       printk("regulatory is not upadted via %s.\n", __func__);
+       if (request)
+               kfree(request);
+       return;
+#endif
+
        request->alpha2[0] = toupper(request->alpha2[0]);
        request->alpha2[1] = toupper(request->alpha2[1]);
 
@@ -2614,6 +2640,18 @@ static void restore_regulatory_settings(bool reset_user)
        LIST_HEAD(tmp_reg_req_list);
        struct cfg80211_registered_device *rdev;
 
+#ifdef CONFIG_CFG80211_REG_NOT_UPDATED
+       /*
+       * SAMSUNG FIX : Regulatory Configuration was update
+       * via WIPHY_FLAG_CUSTOM_REGULATORY of Wi-Fi Driver.
+       * Regulation should not updated even if device found other country Access Point Beacon once
+       * since device should find around other Access Points.
+       * 2014.1.8 Convergence Wi-Fi Core
+       */
+       printk("regulatory is not upadted via %s.\n", __func__);
+       return;
+#endif
+
        ASSERT_RTNL();
 
        /*
@@ -2717,6 +2755,17 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,
        struct reg_beacon *reg_beacon;
        bool processing;
 
+#ifdef CONFIG_CFG80211_REG_NOT_UPDATED
+       /*
+       * SAMSUNG FIX : Regulatory Configuration was update
+       * via WIPHY_FLAG_CUSTOM_REGULATORY of Wi-Fi Driver.
+       * Regulation should not updated even if device found other country Access Point Beacon once
+       * since device should find around other Access Points.
+       * 2014.1.8 Convergence Wi-Fi Core
+       */
+       return 0;
+#endif
+
        if (beacon_chan->beacon_found ||
            beacon_chan->flags & IEEE80211_CHAN_RADAR ||
            (beacon_chan->band == IEEE80211_BAND_2GHZ &&