cfg80211: convert bools into flags

We've accumulated a number of options for wiphys
which make more sense as flags as we keep adding
more. Convert the existing ones.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index fc4ec48eda12..88e41176e7fd 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1146,46 +1146,46 @@ static int __init init_mac80211_hwsim(void)
                         break;
                 case HWSIM_REGTEST_WORLD_ROAM:
                         if (i == 0) {
-                                hw->wiphy->custom_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         }
                         break;
                 case HWSIM_REGTEST_CUSTOM_WORLD:
-                        hw->wiphy->custom_regulatory = true;
+                        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                         wiphy_apply_custom_regulatory(hw->wiphy,
                                 &hwsim_world_regdom_custom_01);
                         break;
                 case HWSIM_REGTEST_CUSTOM_WORLD_2:
                         if (i == 0) {
-                                hw->wiphy->custom_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         } else if (i == 1) {
-                                hw->wiphy->custom_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_02);
                         }
                         break;
                 case HWSIM_REGTEST_STRICT_ALL:
-                        hw->wiphy->strict_regulatory = true;
+                        hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
                         break;
                 case HWSIM_REGTEST_STRICT_FOLLOW:
                 case HWSIM_REGTEST_STRICT_AND_DRIVER_REG:
                         if (i == 0)
-                                hw->wiphy->strict_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
                         break;
                 case HWSIM_REGTEST_ALL:
                         if (i == 0) {
-                                hw->wiphy->custom_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_01);
                         } else if (i == 1) {
-                                hw->wiphy->custom_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
                                 wiphy_apply_custom_regulatory(hw->wiphy,
                                         &hwsim_world_regdom_custom_02);
                         } else if (i == 4)
-                                hw->wiphy->strict_regulatory = true;
+                                hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
                         break;
                 default:
                         break;