ovsdb-idl: Fix iteration over rows in IDL tables.

[openvswitch] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index fccacf217cfc2473e5b00a89313a51844aeabd1b..b20873bf293592c3a0fa89d143f10043433bdd9d 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -15,6 +15,7 @@
 #include <linux/udp.h>
 #include <linux/in6.h>
 #include <linux/if_vlan.h>
+#include <net/inet_ecn.h>
 #include <net/ip.h>
 #include <net/checksum.h>
 #include "datapath.h"
@@ -92,7 +93,7 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                mask = VLAN_VID_MASK;
                key->dl_vlan = htons(tci & mask);
        } else {
-               tci = a->vlan_pcp.vlan_pcp << 13;
+               tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT;
                mask = VLAN_PCP_MASK;
        }
 
@@ -214,42 +215,10 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb,
 {
        __be32 diff[] = { ~from, to };
 
-/* On older kernels, CHECKSUM_PARTIAL and CHECKSUM_COMPLETE are both defined
- * as CHECKSUM_HW.  However, we can make some inferences so that we can update
- * the checksums appropriately. */
-       enum {
-               CSUM_PARTIAL,   /* Partial checksum, skb->csum undefined. */
-               CSUM_PACKET,    /* In-packet checksum, skb->csum undefined. */
-               CSUM_COMPLETE,  /* In-packet checksum, skb->csum valid. */
-       } csum_type;
-
-       csum_type = CSUM_PACKET;
-#ifndef CHECKSUM_HW
-       /* Newer kernel, just map between kernel types and ours. */
-       if (skb->ip_summed == CHECKSUM_PARTIAL)
-               csum_type = CSUM_PARTIAL;
-       else if (skb->ip_summed == CHECKSUM_COMPLETE)
-               csum_type = CSUM_COMPLETE;
-#else
-       /* In theory this could be either CHECKSUM_PARTIAL or CHECKSUM_COMPLETE.
-        * However, we should only get CHECKSUM_PARTIAL packets from Xen, which
-        * uses some special fields to represent this (see below).  Since we
-        * can only make one type work, pick the one that actually happens in
-        * practice. */
-       if (skb->ip_summed == CHECKSUM_HW)
-               csum_type = CSUM_COMPLETE;
-#endif
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
-       /* Xen has a special way of representing CHECKSUM_PARTIAL on older
-        * kernels. */
-       if (skb->proto_csum_blank)
-               csum_type = CSUM_PARTIAL;
-#endif
-
-       if (csum_type != CSUM_PARTIAL) {
+       if (OVS_CB(skb)->ip_summed != CSUM_PARTIAL) {
                *sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
                                ~csum_unfold(*sum)));
-               if (csum_type == CSUM_COMPLETE && pseudohdr)
+               if (OVS_CB(skb)->ip_summed == CSUM_COMPLETE && pseudohdr)
                        skb->csum = ~csum_partial((char *)diff, sizeof(diff),
                                                ~skb->csum);
        } else if (pseudohdr)
@@ -298,10 +267,10 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb,
                struct iphdr *nh = ip_hdr(skb);
                u8 *f = &nh->tos;
                u8 old = *f;
+               u8 new;
 
-               /* We only set the lower 6 bits. */
-               u8 new = (a->nw_tos & 0x3f) | (nh->tos & 0xc0);
-
+               /* Set the DSCP bits and preserve the ECN bits. */
+               new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK);
                update_csum(&nh->check, skb, htons((uint16_t)old),
                                htons((uint16_t)new), 0);
                *f = new;