cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev 

Fix bug of kni while set `vlan_strip=0`.
This commit is contained in:
fengbojiang(姜凤波) 2019-08-06 22:11:54 +08:00
parent 7a9cdd23b7 a20fd2ae31
commit 19dac219c8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ff_dpdk_if.c
View File

@ -862,10 +862,14 @@ protocol_filter(const void *data, uint16_t len)
const struct vlan_hdr *vlanhdr;
hdr = (const struct ether_hdr *)data;
uint16_t ether_type = rte_be_to_cpu_16(hdr->ether_type);
data += ETHER_HDR_LEN;
len -= ETHER_HDR_LEN;
if (ether_type == ETHER_TYPE_VLAN) {
vlanhdr = (struct vlan_hdr *)(data + sizeof(struct ether_hdr));
vlanhdr = (struct vlan_hdr *)data;
ether_type = rte_be_to_cpu_16(vlanhdr->eth_proto);
data += sizeof(struct vlan_hdr);
len -= sizeof(struct vlan_hdr);
}
if(ether_type == ETHER_TYPE_ARP)
@ -873,8 +877,8 @@ protocol_filter(const void *data, uint16_t len)
#ifdef INET6
if (ether_type == ETHER_TYPE_IPv6) {
return ff_kni_proto_filter(data + ETHER_HDR_LEN,
len - ETHER_HDR_LEN, ether_type);
return ff_kni_proto_filter(data,
len, ether_type);
}
#endif
@ -888,8 +892,8 @@ protocol_filter(const void *data, uint16_t len)
if(ether_type != ETHER_TYPE_IPv4)
return FILTER_UNKNOWN;
return ff_kni_proto_filter(data + ETHER_HDR_LEN,
len - ETHER_HDR_LEN, ether_type);
return ff_kni_proto_filter(data,
len, ether_type);
#endif
}