[][MAC80211][hnat][Fix git am issue]

[Description]
Fix git am and patch conflict with mtk_eth_soc.h

[Release-log]

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