X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=98c2bafd306634e6eb2d7e34163f2afb0d31f5fa;hb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;hp=6abd6918571b31487da6d91a191e701ef7487589;hpb=3544358aa5960b148bc31435a0062e9392530ec2;p=sliver-openvswitch.git

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6abd69185..98c2bafd3 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -687,6 +687,11 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 	err = -ENODEV;
 	if (!dp)
 		goto err_unlock;
+
+	if (flow->key.eth.in_port < DP_MAX_PORTS)
+		OVS_CB(packet)->vport = get_vport_protected(dp,
+							flow->key.eth.in_port);
+
 	err = execute_actions(dp, packet);
 	rcu_read_unlock();
 
@@ -744,52 +749,6 @@ static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats)
 	}
 }
 
-/* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports.
- * Called with RTNL lock.
- */
-int dp_min_mtu(const struct datapath *dp)
-{
-	struct vport *p;
-	int mtu = 0;
-
-	ASSERT_RTNL();
-
-	list_for_each_entry (p, &dp->port_list, node) {
-		int dev_mtu;
-
-		/* Skip any internal ports, since that's what we're trying to
-		 * set. */
-		if (is_internal_vport(p))
-			continue;
-
-		dev_mtu = vport_get_mtu(p);
-		if (!dev_mtu)
-			continue;
-		if (!mtu || dev_mtu < mtu)
-			mtu = dev_mtu;
-	}
-
-	return mtu ? mtu : ETH_DATA_LEN;
-}
-
-/* Sets the MTU of all datapath devices to the minimum of the ports
- * Called with RTNL lock.
- */
-void set_internal_devs_mtu(const struct datapath *dp)
-{
-	struct vport *p;
-	int mtu;
-
-	ASSERT_RTNL();
-
-	mtu = dp_min_mtu(dp);
-
-	list_for_each_entry (p, &dp->port_list, node) {
-		if (is_internal_vport(p))
-			vport_set_mtu(p, mtu);
-	}
-}
-
 static const struct nla_policy flow_policy[OVS_FLOW_ATTR_MAX + 1] = {
 	[OVS_FLOW_ATTR_KEY] = { .type = NLA_NESTED },
 	[OVS_FLOW_ATTR_ACTIONS] = { .type = NLA_NESTED },
@@ -1545,13 +1504,12 @@ static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
 	[OVS_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
 	[OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
 	[OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
-	[OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct rtnl_link_stats64) },
+	[OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) },
 	[OVS_VPORT_ATTR_ADDRESS] = { .len = ETH_ALEN },
 #else
-	[OVS_VPORT_ATTR_STATS] = { .minlen = sizeof(struct rtnl_link_stats64) },
+	[OVS_VPORT_ATTR_STATS] = { .minlen = sizeof(struct ovs_vport_stats) },
 	[OVS_VPORT_ATTR_ADDRESS] = { .minlen = ETH_ALEN },
 #endif
-	[OVS_VPORT_ATTR_MTU] = { .type = NLA_U32 },
 	[OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
 };
 
@@ -1574,7 +1532,6 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
 	struct ovs_header *ovs_header;
 	struct nlattr *nla;
 	int ifindex;
-	int mtu;
 	int err;
 
 	ovs_header = genlmsg_put(skb, pid, seq, &dp_vport_genl_family,
@@ -1588,17 +1545,13 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
 	NLA_PUT_U32(skb, OVS_VPORT_ATTR_TYPE, vport_get_type(vport));
 	NLA_PUT_STRING(skb, OVS_VPORT_ATTR_NAME, vport_get_name(vport));
 
-	nla = nla_reserve(skb, OVS_VPORT_ATTR_STATS, sizeof(struct rtnl_link_stats64));
+	nla = nla_reserve(skb, OVS_VPORT_ATTR_STATS, sizeof(struct ovs_vport_stats));
 	if (!nla)
 		goto nla_put_failure;
-	if (vport_get_stats(vport, nla_data(nla)))
-		__skb_trim(skb, skb->len - nla->nla_len);
 
-	NLA_PUT(skb, OVS_VPORT_ATTR_ADDRESS, ETH_ALEN, vport_get_addr(vport));
+	vport_get_stats(vport, nla_data(nla));
 
-	mtu = vport_get_mtu(vport);
-	if (mtu)
-		NLA_PUT_U32(skb, OVS_VPORT_ATTR_MTU, mtu);
+	NLA_PUT(skb, OVS_VPORT_ATTR_ADDRESS, ETH_ALEN, vport_get_addr(vport));
 
 	err = vport_get_options(vport, skb);
 	if (err == -EMSGSIZE)
@@ -1675,12 +1628,13 @@ static struct vport *lookup_vport(struct ovs_header *ovs_header,
 static int change_vport(struct vport *vport, struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
 {
 	int err = 0;
+
 	if (a[OVS_VPORT_ATTR_STATS])
-		err = vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
-	if (!err && a[OVS_VPORT_ATTR_ADDRESS])
+		vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
+
+	if (a[OVS_VPORT_ATTR_ADDRESS])
 		err = vport_set_addr(vport, nla_data(a[OVS_VPORT_ATTR_ADDRESS]));
-	if (!err && a[OVS_VPORT_ATTR_MTU])
-		err = vport_set_mtu(vport, nla_get_u32(a[OVS_VPORT_ATTR_MTU]));
+
 	return err;
 }
 
@@ -1743,7 +1697,6 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
 	if (IS_ERR(vport))
 		goto exit_unlock;
 
- 	set_internal_devs_mtu(dp);
  	dp_sysfs_add_if(vport);
 
 	err = change_vport(vport, a);