[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/10] net: handle optional VLAN header in checks
From: |
Jean-Christophe Dubois |
Subject: |
[Qemu-devel] [PATCH v6 02/10] net: handle optional VLAN header in checksum computation. |
Date: |
Mon, 30 May 2016 19:25:48 +0200 |
Signed-off-by: Jean-Christophe Dubois <address@hidden>
---
Changes since v1:
* Not present on v1
Changes since v2:
* Not present on v2
Changes since v3:
* local variable name change.
Changes since v4:
* None
Changes since v5:
* None
net/checksum.c | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/net/checksum.c b/net/checksum.c
index f62b18a..62d3465 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] [PATCH v6 00/10] Add Ethernet device for i.MX6 SOC, Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 01/10] net: improve UDP/TCP checksum computation., Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 02/10] net: handle optional VLAN header in checksum computation.,
Jean-Christophe Dubois <=
- [Qemu-devel] [PATCH v6 06/10] i.MX: reset TX/RX descriptors when FEC is disabled., Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 04/10] i.MX: Fix FEC code for MDIO address selection, Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 03/10] i.MX: Fix FEC code for MDIO operation selection, Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 07/10] i.MX: Rename i.MX FEC defines to ENET_XXX, Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 05/10] i.MX: Fix FEC code for ECR register reset value., Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 08/10] i.MX: move FEC device to a register array structure., Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 09/10] Add ENET/Gbps Ethernet support to FEC device, Jean-Christophe Dubois, 2016/05/30
- [Qemu-devel] [PATCH v6 10/10] Add ENET device to i.MX6 SOC., Jean-Christophe Dubois, 2016/05/30