tree 26631c2f960d69561124782f73f277a8200b2309
parent 57d8cc63a1edaf2ae9265f4cfed740ab74619284
author developer <developer@mediatek.com> 1726234059 +0800
committer developer <developer@mediatek.com> 1726463426 +0800

[][MAC80211][hnat][Fix patch conflict issue]

[Description]
Fix patch conflict issue.

[Release-log]
N/A


Change-Id: I2b68a503d42e06e88397f32af8a1b2808a40d3a4
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9638064