[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksu
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksum computation. |
Date: |
Thu, 2 Jun 2016 14:48:14 +0800 |
From: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/checksum.c | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/net/checksum.c b/net/checksum.c
index 39ad73f..23323b0 100644
--- a/net/checksum.c
+++ b/net/checksum.c
@@ -55,7 +55,7 @@ uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto,
void net_checksum_calculate(uint8_t *data, int length)
{
- int ip_len;
+ int mac_hdr_len, ip_len;
struct ip_header *ip;
/*
@@ -64,12 +64,39 @@ void net_checksum_calculate(uint8_t *data, int length)
* struct members (just in case).
*/
- /* Ensure data has complete L2 & L3 headers. */
- if (length < (sizeof(struct eth_header) + sizeof(struct ip_header))) {
+ /* Ensure we have at least an Eth header */
+ if (length < sizeof(struct eth_header)) {
return;
}
- ip = (struct ip_header *)(data + sizeof(struct eth_header));
+ /* Handle the optionnal VLAN headers */
+ switch (lduw_be_p(&PKT_GET_ETH_HDR(data)->h_proto)) {
+ case ETH_P_VLAN:
+ mac_hdr_len = sizeof(struct eth_header) +
+ sizeof(struct vlan_header);
+ break;
+ case ETH_P_DVLAN:
+ if (lduw_be_p(&PKT_GET_VLAN_HDR(data)->h_proto) == ETH_P_VLAN) {
+ mac_hdr_len = sizeof(struct eth_header) +
+ 2 * sizeof(struct vlan_header);
+ } else {
+ mac_hdr_len = sizeof(struct eth_header) +
+ sizeof(struct vlan_header);
+ }
+ break;
+ default:
+ mac_hdr_len = sizeof(struct eth_header);
+ break;
+ }
+
+ length -= mac_hdr_len;
+
+ /* Now check we have an IP header (with an optionnal VLAN header) */
+ if (length < sizeof(struct ip_header)) {
+ return;
+ }
+
+ ip = (struct ip_header *)(data + mac_hdr_len);
if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) {
return; /* not IPv4 */
--
2.7.4
- [Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing macros, (continued)
- [Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing macros, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 15/31] rtl8139: Move more TCP definitions to common header, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 14/31] net_pkt: Name vmxnet3 packet abstractions more generic, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 17/31] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 16/31] net_pkt: Extend packet abstraction as required by e1000e functionality, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 18/31] e1000_regs: Add definitions for Intel 82574-specific bits, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 19/31] e1000: Move out code that will be reused in e1000e, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 22/31] net: improve UDP/TCP checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 21/31] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 24/31] i.MX: Fix FEC code for MDIO operation selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksum computation.,
Jason Wang <=
- [Qemu-devel] [PULL V4 26/31] i.MX: Fix FEC code for ECR register reset value., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 25/31] i.MX: Fix FEC code for MDIO address selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 27/31] i.MX: reset TX/RX descriptors when FEC is disabled., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 28/31] i.MX: Rename i.MX FEC defines to ENET_XXX, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 20/31] net: Introduce e1000e device emulation, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 29/31] i.MX: move FEC device to a register array structure., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 31/31] Add ENET device to i.MX6 SOC., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 30/31] Add ENET/Gbps Ethernet support to FEC device, Jason Wang, 2016/06/02
- Re: [Qemu-devel] [PULL V4 00/31] Net patches, Peter Maydell, 2016/06/02