From 2c7807ac4f578bfdd7a46b79028935c9aa34cde3 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 1 Sep 2009 10:12:12 -0700 Subject: [PATCH] datapath: Remove WARN_ON_ONCE(1) now that this code has been exercised. The code on one side of this #if fork was difficult to test until Xen upgraded to a new enough kernel that it would exercise it. Later Xen kernels are now available and this code path has been tested, at least to some extent, so remove the warning. Thanks to Ian Campbell for pointing out the warning. --- datapath/datapath.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index 9d163ea5..d822b73c 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -646,17 +646,14 @@ dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no, /* If a checksum-deferred packet is forwarded to the controller, * correct the pointers and checksum. This happens on a regular basis - * only on Xen (the CHECKSUM_HW case), on which VMs can pass up packets - * that do not have their checksum computed. We also implement it for - * the non-Xen case, but it is difficult to trigger or test this case - * there, hence the WARN_ON_ONCE(). + * only on Xen, on which VMs can pass up packets that do not have their + * checksum computed. */ err = vswitch_skb_checksum_setup(skb); if (err) goto err_kfree_skb; #ifndef CHECKSUM_HW if (skb->ip_summed == CHECKSUM_PARTIAL) { - WARN_ON_ONCE(1); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) /* Until 2.6.22, the start of the transport header was also the * start of data to be checksummed. Linux 2.6.22 introduced -- 2.30.2