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

diff --git a/datapath/actions.c b/datapath/actions.c
index cb29a998..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"
@@ -213,10 +214,11 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb,
 			__be32 from, __be32 to, int pseudohdr)
 {
 	__be32 diff[] = { ~from, to };
-	if (skb->ip_summed != CHECKSUM_PARTIAL) {
+
+	if (OVS_CB(skb)->ip_summed != CSUM_PARTIAL) {
 		*sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
 				~csum_unfold(*sum)));
-		if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
+		if (OVS_CB(skb)->ip_summed == CSUM_COMPLETE && pseudohdr)
 			skb->csum = ~csum_partial((char *)diff, sizeof(diff),
 						~skb->csum);
 	} else if (pseudohdr)
@@ -252,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,
@@ -276,7 +302,7 @@ set_tp_port(struct sk_buff *skb, struct odp_flow_key *key,
 		u16 old = *f;
 		u16 new = a->tp_port;
 		update_csum((u16*)(skb_transport_header(skb) + check_ofs), 
-				skb, old, new, 1);
+				skb, old, new, 0);
 		*f = new;
 	}
 	return skb;
@@ -302,6 +328,7 @@ int dp_xmit_skb(struct sk_buff *skb)
 		return -E2BIG;
 	}
 
+	forward_ip_summed(skb);
 	dev_queue_xmit(skb);
 
 	return len;
@@ -457,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);