[][MAC80211][WED][Fix patch conflicts]

[Description]
Fix patch conficts.

[Release-log]
N/A

Change-Id: Ib4951d7645e964baa092fad969d33d3dabb4dea8
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6203470
1 file changed