From patchwork Tue Jun 28 09:17:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 641452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rf0rV3x8Fz9sCp for ; Tue, 28 Jun 2016 19:29:46 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id CED5A10866; Tue, 28 Jun 2016 02:29:45 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id A926810214 for ; Tue, 28 Jun 2016 02:29:44 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 346971E066E for ; Tue, 28 Jun 2016 03:29:44 -0600 (MDT) X-ASG-Debug-ID: 1467106183-09eadd17ad0abd0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id 2v8U2FOuLCei1n4b (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 28 Jun 2016 03:29:43 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO slow1-d.mail.gandi.net) (217.70.178.86) by mx1-pf1.cudamail.com with SMTP; 28 Jun 2016 09:29:43 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at ovn.org designates 217.70.178.86 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.178.86 X-Barracuda-RBL-IP: 217.70.178.86 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id A2FC3E239C for ; Tue, 28 Jun 2016 11:18:11 +0200 (CEST) X-Originating-IP: 130.37.168.99 Received: from archer.localdomain (unknown [130.37.168.99]) (Authenticated sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 76800C5A7B for ; Tue, 28 Jun 2016 11:18:11 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-627004350 X-CudaMail-DTE: 062816 X-CudaMail-Originating-IP: 217.70.178.86 Date: Tue, 28 Jun 2016 11:17:56 +0200 X-ASG-Orig-Subj: [##CM-E1-627004350##][PATCH] datapath: Drop debug code in handle_fragments(). Message-Id: <1467105476-15377-1-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.8.2 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1467106183 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH] datapath: Drop debug code in handle_fragments(). X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" This piece of debug code was introduced during the backport of conntrack, but is unnecessary and not upstream. Drop it to bring the code more inline with upstream. Reported-by: Jesse Gross Signed-off-by: Joe Stringer Acked-by: Jesse Gross --- datapath/conntrack.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index aaf43ec346e6..4d42f795f3c5 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -398,11 +398,6 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, struct ovs_gso_cb ovs_cb = *OVS_GSO_CB(skb); int err; - if (!skb->dev) { - OVS_NLERR(true, "%s: skb has no dev; dropping", __func__); - return -EINVAL; - } - if (key->eth.type == htons(ETH_P_IP)) { enum ip_defrag_users user = IP_DEFRAG_CONNTRACK_IN + zone;