diff mbox

[ovs-dev] datapath: Drop debug code in handle_fragments().

Message ID 1467105476-15377-1-git-send-email-joe@ovn.org
State Accepted
Headers show

Commit Message

Joe Stringer June 28, 2016, 9:17 a.m. UTC 
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 <jesse@kernel.org>
Signed-off-by: Joe Stringer <joe@ovn.org>
---
 datapath/conntrack.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Jesse Gross June 28, 2016, 2:57 p.m. UTC | #1 
On Tue, Jun 28, 2016 at 2:17 AM, Joe Stringer <joe@ovn.org> wrote:
> 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 <jesse@kernel.org>
> Signed-off-by: Joe Stringer <joe@ovn.org>

Acked-by: Jesse Gross <jesse@kernel.org>
Joe Stringer June 29, 2016, 11:46 a.m. UTC | #2 
On 28 June 2016 at 16:57, Jesse Gross <jesse@kernel.org> wrote:
> On Tue, Jun 28, 2016 at 2:17 AM, Joe Stringer <joe@ovn.org> wrote:
>> 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 <jesse@kernel.org>
>> Signed-off-by: Joe Stringer <joe@ovn.org>
>
> Acked-by: Jesse Gross <jesse@kernel.org>

Thanks, applied.
diff mbox

Patch

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;