X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fdatapath.c;h=566aeed6e5dc3d10cc62d2512f1f03cd6035d4b4;hb=c3729ee42dc25a8240cee6c0041b7db3e4070414;hp=826d8991eb2f371b5d17d0ba143d4297057ee64c;hpb=76abe283baa043bae84163873b0c7c498bfb260a;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 826d8991..566aeed6 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -53,6 +53,11 @@
 #include "vlan.h"
 #include "vport-internal_dev.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) || \
+    LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)
+#error Kernels before 2.6.18 or after 2.6.39 are not supported by this version of Open vSwitch.
+#endif
+
 int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 EXPORT_SYMBOL(dp_ioctl_hook);
 
@@ -394,11 +399,7 @@ int dp_upcall(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_i
 
 	WARN_ON_ONCE(skb_shared(skb));
 
-	forward_ip_summed(skb);
-
-	err = vswitch_skb_checksum_setup(skb);
-	if (err)
-		goto err_kfree_skb;
+	forward_ip_summed(skb, true);
 
 	/* Break apart GSO packets into their component pieces.  Otherwise
 	 * userspace may try to stuff a 64kB packet into a 1500-byte MTU. */
@@ -419,8 +420,6 @@ int dp_upcall(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_i
 
 	return 0;
 
-err_kfree_skb:
-	kfree_skb(skb);
 err:
 	local_bh_disable();
 	stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
@@ -565,7 +564,6 @@ static int validate_actions(const struct nlattr *attr)
 			[ODP_ACTION_ATTR_SET_TUNNEL] = 8,
 			[ODP_ACTION_ATTR_SET_PRIORITY] = 4,
 			[ODP_ACTION_ATTR_POP_PRIORITY] = 0,
-			[ODP_ACTION_ATTR_DROP_SPOOFED_ARP] = 0,
 		};
 		int type = nla_type(a);
 
@@ -587,7 +585,6 @@ static int validate_actions(const struct nlattr *attr)
 		case ODP_ACTION_ATTR_SET_TUNNEL:
 		case ODP_ACTION_ATTR_SET_PRIORITY:
 		case ODP_ACTION_ATTR_POP_PRIORITY:
-		case ODP_ACTION_ATTR_DROP_SPOOFED_ARP:
 			/* No validation needed. */
 			break;
 
@@ -655,7 +652,8 @@ static int odp_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 	int key_len;
 
 	err = -EINVAL;
-	if (!a[ODP_PACKET_ATTR_PACKET] || !a[ODP_PACKET_ATTR_ACTIONS] ||
+	if (!a[ODP_PACKET_ATTR_PACKET] || !a[ODP_PACKET_ATTR_KEY] ||
+	    !a[ODP_PACKET_ATTR_ACTIONS] ||
 	    nla_len(a[ODP_PACKET_ATTR_PACKET]) < ETH_HLEN)
 		goto err;
 
@@ -694,6 +692,12 @@ static int odp_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 		goto err_flow_put;
 	flow->tbl_node.hash = flow_hash(&flow->key, key_len);
 
+	err = flow_metadata_from_nlattrs(&flow->key.eth.in_port,
+					 &flow->key.eth.tun_id,
+					 a[ODP_PACKET_ATTR_KEY]);
+	if (err)
+		goto err_flow_put;
+
 	acts = flow_actions_alloc(a[ODP_PACKET_ATTR_ACTIONS]);
 	err = PTR_ERR(acts);
 	if (IS_ERR(acts))
@@ -725,6 +729,7 @@ err:
 
 static const struct nla_policy packet_policy[ODP_PACKET_ATTR_MAX + 1] = {
 	[ODP_PACKET_ATTR_PACKET] = { .type = NLA_UNSPEC },
+	[ODP_PACKET_ATTR_KEY] = { .type = NLA_NESTED },
 	[ODP_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
 };
 
@@ -1904,7 +1909,9 @@ static int odp_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
 	if (IS_ERR(reply))
 		goto exit_unlock;
 
-	err = genlmsg_reply(reply, info);
+	rcu_read_unlock();
+
+	return genlmsg_reply(reply, info);
 
 exit_unlock:
 	rcu_read_unlock();