aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 7ddd16a51adf..c9f5ad5d5d94 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1989,11 +1989,8 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
1989 return REG_REQ_IGNORE; 1989 return REG_REQ_IGNORE;
1990 return REG_REQ_ALREADY_SET; 1990 return REG_REQ_ALREADY_SET;
1991 } 1991 }
1992 /* 1992
1993 * Two consecutive Country IE hints on the same wiphy. 1993 if (regdom_changes(country_ie_request->alpha2))
1994 * This should be picked up early by the driver/stack
1995 */
1996 if (WARN_ON(regdom_changes(country_ie_request->alpha2)))
1997 return REG_REQ_OK; 1994 return REG_REQ_OK;
1998 return REG_REQ_ALREADY_SET; 1995 return REG_REQ_ALREADY_SET;
1999} 1996}