X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=b20873bf293592c3a0fa89d143f10043433bdd9d;hb=f2ba3c0a425ba0745cd2640d38dc7e816333d1c6;hp=4fc0a4a4405929c2a7c6acb30e4499a75dfa7a5d;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index 4fc0a4a4..b20873bf 100644
--- 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)
@@ -285,6 +254,30 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb,
 	return skb;
 }
 
+static struct sk_buff *set_nw_tos(struct sk_buff *skb,
+				   struct odp_flow_key *key,
+				   const struct odp_action_nw_tos *a,
+				   gfp_t gfp)
+{
+	if (key->dl_type != htons(ETH_P_IP))
+		return skb;
+
+	skb = make_writable(skb, 0, gfp);
+	if (skb) {
+		struct iphdr *nh = ip_hdr(skb);
+		u8 *f = &nh->tos;
+		u8 old = *f;
+		u8 new;
+
+		/* 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;
+	}
+	return skb;
+}
+
 static struct sk_buff *
 set_tp_port(struct sk_buff *skb, struct odp_flow_key *key,
 	    const struct odp_action_tp_port *a,
@@ -491,6 +484,10 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 			skb = set_nw_addr(skb, key, &a->nw_addr, gfp);
 			break;
 
+		case ODPAT_SET_NW_TOS:
+			skb = set_nw_tos(skb, key, &a->nw_tos, gfp);
+			break;
+
 		case ODPAT_SET_TP_SRC:
 		case ODPAT_SET_TP_DST:
 			skb = set_tp_port(skb, key, &a->tp_port, gfp);