diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index c3861e414804..255905f971c8 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2203,11 +2203,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 			}
 			break;
 		case NL80211_IFTYPE_NAN:
-			res = ieee80211_reconfig_nan(sdata);
-			if (res < 0) {
-				ieee80211_handle_reconfig_failure(local);
-				return res;
-			}
+			WARN_ON(ieee80211_reconfig_nan(sdata));
 			break;
 		case NL80211_IFTYPE_NAN_DATA:
 		case NL80211_IFTYPE_AP_VLAN: