File tree Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -83,7 +83,6 @@ struct regulatory_request {
83
83
enum nl80211_dfs_regions dfs_region ;
84
84
bool intersect ;
85
85
bool processed ;
86
- bool reload ;
87
86
enum environment_cap country_ie_env ;
88
87
struct list_head list ;
89
88
};
Original file line number Diff line number Diff line change @@ -1134,9 +1134,8 @@ int reg_reload_regdb(void)
1134
1134
request -> wiphy_idx = WIPHY_IDX_INVALID ;
1135
1135
request -> alpha2 [0 ] = current_regdomain -> alpha2 [0 ];
1136
1136
request -> alpha2 [1 ] = current_regdomain -> alpha2 [1 ];
1137
- request -> initiator = NL80211_USER_REG_HINT_USER ;
1137
+ request -> initiator = NL80211_REGDOM_SET_BY_CORE ;
1138
1138
request -> user_reg_hint_type = NL80211_USER_REG_HINT_USER ;
1139
- request -> reload = true;
1140
1139
1141
1140
reg_process_hint (request );
1142
1141
@@ -2712,8 +2711,7 @@ reg_process_hint_user(struct regulatory_request *user_request)
2712
2711
2713
2712
treatment = __reg_process_hint_user (user_request );
2714
2713
if (treatment == REG_REQ_IGNORE ||
2715
- (treatment == REG_REQ_ALREADY_SET &&
2716
- !user_request -> reload ))
2714
+ treatment == REG_REQ_ALREADY_SET )
2717
2715
return REG_REQ_IGNORE ;
2718
2716
2719
2717
user_request -> intersect = treatment == REG_REQ_INTERSECT ;
You can’t perform that action at this time.
0 commit comments