[][Kernel][common][hnat][Add PPPoe DSlite BIND PPE entry]
[Description]
Add PPPoe DSlite BIND PPE entry.
When packets are forwarded in PPPoe DSlite scenarios,
BIND entries can be used to improve the forwarding performance.
Without this patch, some customer testing standards cannot be met.
[Release-log]
N/A
Change-Id: I32741965d2e44aceaf8a64caea7a5e94ff54b27f
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7594764
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 7d1a0a9..b63e45c 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
@@ -980,10 +980,20 @@
struct neighbour *neigh = NULL;
struct dst_entry *dst = skb_dst(skb);
struct ethhdr *eth;
+ u16 eth_pppoe_hlen = ETH_HLEN + PPPOE_SES_HLEN;
if (hw_path->flags & FLOW_OFFLOAD_PATH_PPPOE) {
- memcpy(eth_hdr(skb)->h_source, hw_path->eth_src, ETH_ALEN);
- memcpy(eth_hdr(skb)->h_dest, hw_path->eth_dest, ETH_ALEN);
+ if (ipv6_hdr(skb)->nexthdr == NEXTHDR_IPIP) {
+ eth = (struct ethhdr *)(skb->data - eth_pppoe_hlen);
+ eth->h_proto = skb->protocol;
+ ether_addr_copy(eth->h_dest, hw_path->eth_dest);
+ ether_addr_copy(eth->h_source, hw_path->eth_src);
+ } else {
+ eth = eth_hdr(skb);
+ memcpy(eth->h_source, hw_path->eth_src, ETH_ALEN);
+ memcpy(eth->h_dest, hw_path->eth_dest, ETH_ALEN);
+ }
+
return 0;
}
@@ -1166,6 +1176,20 @@
return entry;
}
+static struct ethhdr *get_ipv6_ipip_ethhdr(struct sk_buff *skb,
+ struct flow_offload_hw_path *hw_path)
+{
+ struct ethhdr *eth;
+ u16 eth_pppoe_hlen = ETH_HLEN + PPPOE_SES_HLEN;
+
+ if (hw_path->flags & FLOW_OFFLOAD_PATH_PPPOE)
+ eth = (struct ethhdr *)(skb->data - eth_pppoe_hlen);
+ else
+ eth = (struct ethhdr *)(skb->data - ETH_HLEN);
+
+ return eth;
+}
+
static unsigned int skb_to_hnat_info(struct sk_buff *skb,
const struct net_device *dev,
struct foe_entry *foe,
@@ -1190,7 +1214,7 @@
if (ipv6_hdr(skb)->nexthdr == NEXTHDR_IPIP)
/* point to ethernet header for DS-Lite and MapE */
- eth = (struct ethhdr *)(skb->data - ETH_HLEN);
+ eth = get_ipv6_ipip_ethhdr(skb, hw_path);
else
eth = eth_hdr(skb);