diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index d01b689260..26c5ef4b1a 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=5.4.27-1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.4.27/
 PKG_HASH:=4c853a2f4c4fcc81cf60a3d59c5efbdb60c3e4acda22996cb192443581753950
 
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 501b1ad0de..1ebdceaab8 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -440,15 +440,16 @@ mac80211_iw_interface_add() {
 	local type="$3"
 	local wdsflag="$4"
 	local rc
+	local oldifname
 
-	iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
+	iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
 	rc="$?"
 
 	[ "$rc" = 233 ] && {
 		# Device might have just been deleted, give the kernel some time to finish cleaning it up
 		sleep 1
 
-		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
+		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
 		rc="$?"
 	}
 
@@ -475,17 +476,26 @@ mac80211_iw_interface_add() {
 	}
 
 	[ "$rc" = 233 ] && {
-		iw dev "$ifname" del
-		sleep 1
+		iw dev "$ifname" del >/dev/null 2>&1
+		[ "$?" = 0 ] && {
+			sleep 1
 
-		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
-		rc="$?"
+			iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
+			rc="$?"
+		}
 	}
 
-	[ "$rc" = 233 ] && {
+	[ "$rc" != 0 ] && {
 		# Device might not support virtual interfaces, so the interface never got deleted in the first place.
 		# Check if the interface already exists, and avoid failing in this case.
-		ip link show dev "$ifname" >/dev/null 2>/dev/null && rc=0
+		[ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && rc=0
+	}
+
+	[ "$rc" != 0 ] && {
+		# Device doesn't support virtual interfaces and may have existing interface other than ifname.
+		oldifname="$(basename "/sys/class/ieee80211/${phy}/device/net"/* 2>/dev/null)"
+		[ "$oldifname" ] && ip link set "$oldifname" name "$ifname" 1>/dev/null 2>&1
+		rc="$?"
 	}
 
 	[ "$rc" != 0 ] && wireless_setup_failed INTERFACE_CREATION_FAILED