| commit | 729f0271c8551c2feba8aa68c5ec2a03d5324e06 | [log] [tgz] |
|---|---|---|
| author | developer <developer@mediatek.com> | Wed Jun 09 17:28:38 2021 +0800 |
| committer | developer <developer@mediatek.com> | Thu Jun 10 20:28:11 2021 +0800 |
| tree | 4b7324574e6c80eb93c9c29f203d18b20d0cbceb | |
| parent | a7f8fa4e951c2b637932dfcafc0353f2cd3201ad [diff] |
[][Fill prot field on ipv6-3t entry] [Description] Add fill protocol and hash placeholder field on ipv6-3t-route entry [Release-log] N/A Change-Id: I69bb1c1c3e37dab42a5bc1f3bc65e2e331e698e3 Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/4627943
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h index 517732e..178815b 100644 --- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h +++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h
@@ -428,7 +428,7 @@ u32 ipv6_dip2; u32 ipv6_dip3; u32 prot : 8; - u32 resv : 24; + u32 hph : 24; /* hash placeholder */ u32 resv1; u32 resv2;
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c index 70ba913..273faa4 100644 --- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c +++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c
@@ -1243,6 +1243,13 @@ entry.ipv6_3t_route.ipv6_dip3 = foe->ipv6_3t_route.ipv6_dip3; + if (IS_IPV6_3T_ROUTE(foe)) { + entry.ipv6_3t_route.prot = + foe->ipv6_3t_route.prot; + entry.ipv6_3t_route.hph = + foe->ipv6_3t_route.hph; + } + if (IS_IPV6_5T_ROUTE(foe) || IS_IPV6_6RD(foe)) { entry.ipv6_5t_route.sport = foe->ipv6_5t_route.sport;