From: Jiri Benc <jbenc@redhat.com>
To: Andreas Schultz <aschultz@tpip.net>
Cc: netdev@vger.kernel.org, Pravin B Shelar <pshelar@nicira.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH net v2] fix return of iptunnel_xmit
Date: Thu, 8 Oct 2015 17:39:14 +0200 [thread overview]
Message-ID: <20151008173914.16150fd0@griffin> (raw)
In-Reply-To: <56168CE2.6060208@tpip.net>
On Thu, 8 Oct 2015 17:33:54 +0200, Andreas Schultz wrote:
> --- a/net/ipv4/ip_tunnel_core.c
> +++ b/net/ipv4/ip_tunnel_core.c
> @@ -80,9 +80,12 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
> skb_shinfo(skb)->gso_segs ?: 1);
>
> err = ip_local_out_sk(sk, skb);
> - if (unlikely(net_xmit_eval(err)))
> - pkt_len = 0;
> - return pkt_len;
> + if (likely(net_xmit_eval(err) == 0))
> + return pkt_len;
> + if (err < 0)
> + return err;
> +
> + return 0;
> }
That looks better :-)
Thanks,
Jiri
--
Jiri Benc
prev parent reply other threads:[~2015-10-08 15:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 10:11 [PATCH net v2] fix return of iptunnel_xmit Andreas Schultz
2015-10-08 15:08 ` Jiri Benc
2015-10-08 15:33 ` Andreas Schultz
2015-10-08 15:39 ` Jiri Benc [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151008173914.16150fd0@griffin \
--to=jbenc@redhat.com \
--cc=aschultz@tpip.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=pshelar@nicira.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).