X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Factions.c;h=30ea1d23e9c2ce99d7f6333ff35336ddf6a2de1d;hb=2d04b6ea214daf96020ce5ca994fcb5380556247;hp=fa4b9045f508e8488b519869e521e7ed363a7f67;hpb=10f72e3da94f99cf71ebe49cc03ef49d88a55656;p=sliver-openvswitch.git

diff --git a/datapath/actions.c b/datapath/actions.c
index fa4b9045f..30ea1d23e 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -34,7 +34,6 @@
 #include <net/dsfield.h>
 #include <net/sctp/checksum.h>
 
-#include "checksum.h"
 #include "datapath.h"
 #include "vlan.h"
 #include "vport.h"
@@ -60,7 +59,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci)
 	if (unlikely(err))
 		return err;
 
-	if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
+	if (skb->ip_summed == CHECKSUM_COMPLETE)
 		skb->csum = csum_sub(skb->csum, csum_partial(skb->data
 					+ (2 * ETH_ALEN), VLAN_HLEN, 0));
 
@@ -117,7 +116,7 @@ static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vla
 		if (!__vlan_put_tag(skb, skb->vlan_proto, current_tag))
 			return -ENOMEM;
 
-		if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
+		if (skb->ip_summed == CHECKSUM_COMPLETE)
 			skb->csum = csum_add(skb->csum, csum_partial(skb->data
 					+ (2 * ETH_ALEN), VLAN_HLEN, 0));
 
@@ -134,16 +133,12 @@ static int set_eth_addr(struct sk_buff *skb,
 	if (unlikely(err))
 		return err;
 
-	if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
-		skb->csum = csum_sub(skb->csum, csum_partial(eth_hdr(skb),
-							     ETH_ALEN * 2, 0));
+	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_ALEN * 2);
 
 	memcpy(eth_hdr(skb)->h_source, eth_key->eth_src, ETH_ALEN);
 	memcpy(eth_hdr(skb)->h_dest, eth_key->eth_dst, ETH_ALEN);
 
-	if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
-		skb->csum = csum_add(skb->csum, csum_partial(eth_hdr(skb),
-							     ETH_ALEN * 2, 0));
+	ovs_skb_postpush_rcsum(skb, eth_hdr(skb), ETH_ALEN * 2);
 
 	return 0;
 }
@@ -161,8 +156,7 @@ static void set_ip_addr(struct sk_buff *skb, struct iphdr *nh,
 		if (likely(transport_len >= sizeof(struct udphdr))) {
 			struct udphdr *uh = udp_hdr(skb);
 
-			if (uh->check ||
-			    get_ip_summed(skb) == OVS_CSUM_PARTIAL) {
+			if (uh->check || skb->ip_summed == CHECKSUM_PARTIAL) {
 				inet_proto_csum_replace4(&uh->check, skb,
 							 *addr, new_addr, 1);
 				if (!uh->check)
@@ -189,8 +183,7 @@ static void update_ipv6_checksum(struct sk_buff *skb, u8 l4_proto,
 		if (likely(transport_len >= sizeof(struct udphdr))) {
 			struct udphdr *uh = udp_hdr(skb);
 
-			if (uh->check ||
-			    get_ip_summed(skb) == OVS_CSUM_PARTIAL) {
+			if (uh->check || skb->ip_summed == CHECKSUM_PARTIAL) {
 				inet_proto_csum_replace16(&uh->check, skb,
 							  addr, new_addr, 1);
 				if (!uh->check)
@@ -311,7 +304,7 @@ static void set_udp_port(struct sk_buff *skb, __be16 *port, __be16 new_port)
 {
 	struct udphdr *uh = udp_hdr(skb);
 
-	if (uh->check && get_ip_summed(skb) != OVS_CSUM_PARTIAL) {
+	if (uh->check && skb->ip_summed != CHECKSUM_PARTIAL) {
 		set_tp_port(skb, port, new_port, &uh->check);
 
 		if (!uh->check)
@@ -478,7 +471,7 @@ static int execute_set_action(struct sk_buff *skb,
 		break;
 
 	case OVS_KEY_ATTR_SKB_MARK:
-		skb_set_mark(skb, nla_get_u32(nested_attr));
+		skb->mark = nla_get_u32(nested_attr);
 		break;
 
 	case OVS_KEY_ATTR_IPV4_TUNNEL: