X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fdatapath.c;h=79a1f63251f7ece61613e81f6738603af7e7db86;hb=f4267e344a9373a4efefff8f8f5b85f532d223e1;hp=83dd76fefcbd4d6d072c98d72b12b7cc5285cd2d;hpb=e1c1de3922cddb59775e819b47c421f90f364214;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 83dd76fe..79a1f632 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -428,8 +428,7 @@ got_port_no:
 	if (err)
 		goto out_unlock_dp;
 
-	if (!(port.flags & ODP_PORT_INTERNAL))
-		set_internal_devs_mtu(dp);
+	set_internal_devs_mtu(dp);
 	dp_sysfs_add_if(dp->ports[port_no]);
 
 	err = __put_user(port_no, &portp->port);
@@ -523,7 +522,6 @@ void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
 	skb_warn_if_lro(skb);
 
 	OVS_CB(skb)->dp_port = p;
-	compute_ip_summed(skb, false);
 
 	/* BHs are off so we don't have to use get_cpu()/put_cpu() here. */
 	stats = percpu_ptr(dp->stats_percpu, smp_processor_id());
@@ -626,8 +624,7 @@ out:
  *	be computed if it is sent off box.  Unfortunately on earlier kernels,
  *	this case is impossible to distinguish from #2, despite having opposite
  *	meanings.  Xen adds an extra field on earlier kernels (see #4) in order
- *	to distinguish the different states.  The only real user of this type
- *	with bridging is Xen (on later kernels).
+ *	to distinguish the different states.
  * 4. CHECKSUM_UNNECESSARY (with proto_csum_blank true): This packet was
  *	generated locally by a Xen DomU and has a partial checksum.  If it is
  *	handled on this machine (Dom0 or DomU), then the checksum will not be
@@ -651,12 +648,7 @@ out:
  * packet is processed by the local IP stack, in which case it will need to
  * be reverified).  If we receive a packet with CHECKSUM_HW that really means
  * CHECKSUM_PARTIAL, it will be sent with the wrong checksum.  However, there
- * shouldn't be any devices that do this with bridging.
- *
- * The bridge has similar behavior and this function closely resembles
- * skb_forward_csum().  It is slightly different because we are only concerned
- * with bridging and not other types of forwarding and can get away with
- * slightly more optimal behavior.*/
+ * shouldn't be any devices that do this with bridging. */
 void
 compute_ip_summed(struct sk_buff *skb, bool xmit)
 {
@@ -671,14 +663,14 @@ compute_ip_summed(struct sk_buff *skb, bool xmit)
 		break;
 #ifdef CHECKSUM_HW
 	/* 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.
+	 * However, on the receive side 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.
 	 *
-	 * The one exception to this is if we are on the transmit path
-	 * (basically after skb_checksum_setup() has been run) the type has
-	 * already been converted, so we should stay with that. */
+	 * On the transmit side (basically after skb_checksum_setup()
+	 * has been run or on internal dev transmit), packets with
+	 * CHECKSUM_COMPLETE aren't generated, so assume CHECKSUM_PARTIAL. */
 	case CHECKSUM_HW:
 		if (!xmit)
 			OVS_CB(skb)->ip_summed = OVS_CSUM_COMPLETE;
@@ -711,6 +703,10 @@ compute_ip_summed(struct sk_buff *skb, bool xmit)
 #endif
 }
 
+/* This function closely resembles skb_forward_csum() used by the bridge.  It
+ * is slightly different because we are only concerned with bridging and not
+ * other types of forwarding and can get away with slightly more optimal
+ * behavior.*/
 void
 forward_ip_summed(struct sk_buff *skb)
 {
@@ -742,9 +738,7 @@ queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue,
 		skb->next = NULL;
 
 		/* If a checksum-deferred packet is forwarded to the
-		 * controller, correct the pointers and checksum.  This happens
-		 * on a regular basis only on Xen, on which VMs can pass up
-		 * packets that do not have their checksum computed.
+		 * controller, correct the pointers and checksum.
 		 */
 		err = vswitch_skb_checksum_setup(skb);
 		if (err)
@@ -1358,7 +1352,7 @@ int dp_min_mtu(const struct datapath *dp)
 }
 
 /* Sets the MTU of all datapath devices to the minimum of the ports.  Must
- * be called with RTNL lock and dp_mutex. */
+ * be called with RTNL lock. */
 void set_internal_devs_mtu(const struct datapath *dp)
 {
 	struct dp_port *p;