[][MAC80211][Fix patch conflicts]

[Description]
Fix patch conflicts

[Release-log]
N/A

Change-Id: Ifc218967eaaade387bcca391a09d0ff582fcbad3
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6236471
4 files changed