| commit | e0c07cd521cf8cc4d20c6af392ce05127e6b0d70 | [log] [tgz] |
|---|---|---|
| author | developer <developer@mediatek.com> | Tue Aug 22 14:03:25 2023 +0800 |
| committer | developer <developer@mediatek.com> | Wed Aug 23 09:43:04 2023 +0800 |
| tree | 92b78f181bdcf447391ec94237466090a4b73e30 | |
| parent | b45dece60ab1e3534ce57e3fa9ce7197a6e9f88e [diff] |
[][openwrt][mt7988][tops][Fix conflict: empty line] [Description] Fix conflict. Empty line in hnat_nf_hook.c causes patch conflict. [Release-log] N/A Change-Id: Ic840f6d893ee9e1e4eae1c34ea6132609dee01b9 Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7911890
diff --git a/target/linux/mediatek/patches-5.4/999-4100-mtk-tops-tunnel-offload-support.patch b/target/linux/mediatek/patches-5.4/999-4100-mtk-tops-tunnel-offload-support.patch index 65781ca..3c17392 100644 --- a/target/linux/mediatek/patches-5.4/999-4100-mtk-tops-tunnel-offload-support.patch +++ b/target/linux/mediatek/patches-5.4/999-4100-mtk-tops-tunnel-offload-support.patch
@@ -277,14 +277,6 @@ entry.bfib1.pkt_type = foe->udib1.pkt_type; /* Get packte type state*/ entry.bfib1.state = foe->udib1.state; -@@ -1248,6 +1350,7 @@ static unsigned int skb_to_hnat_info(str - switch (ntohs(eth->h_proto)) { - case ETH_P_IP: - iph = ip_hdr(skb); -+ - switch (iph->protocol) { - case IPPROTO_UDP: - udp = 1; @@ -1629,6 +1732,10 @@ static unsigned int skb_to_hnat_info(str /* Fill Layer2 Info.*/ entry = ppe_fill_L2_info(eth, entry, hw_path);