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

[Description]
Fix patch conflicts

[Release-log]
N/A

Change-Id: I34e4d606e154eb7ddd819bb97d120a916f7e1101
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6201080
2 files changed