Message ID | 1467105476-15377-1-git-send-email-joe@ovn.org |
---|---|
State | Accepted |
Headers | show |
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>
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 --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;
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(-)