From: Andreas Schultz <aschultz@tpip.net>
To: netdev@vger.kernel.org
Cc: Pravin B Shelar <pshelar@nicira.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH net v2] fix return of iptunnel_xmit
Date: Thu, 8 Oct 2015 12:11:54 +0200 [thread overview]
Message-ID: <1444299114-21345-1-git-send-email-aschultz@tpip.net> (raw)
All users of iptunnel_xmit expect the return value to be the error
code from ip_output_local, but currently the return value is length
of the send data on success or zero on error.
Change iptunnel_xmit returns to match the callers expectation.
This bug was introduced when the ip_tunnel_core code was refactored.
Fixes: 0e6fbc5b6c6218987c93b8c7ca60cf786062899d
Signed-off-by: Andreas Schultz <aschultz@tpip.net>
---
Change in v2:
- remove unused variable pkt_len
---
net/ipv4/ip_tunnel_core.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 84dce6a..c167c4a 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -52,9 +52,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 proto,
__u8 tos, __u8 ttl, __be16 df, bool xnet)
{
- int pkt_len = skb->len - skb_inner_network_offset(skb);
struct iphdr *iph;
- int err;
skb_scrub_packet(skb, xnet);
@@ -79,10 +77,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
__ip_select_ident(dev_net(rt->dst.dev), iph,
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;
+ return ip_local_out_sk(sk, skb);
}
EXPORT_SYMBOL_GPL(iptunnel_xmit);
--
2.1.4
next reply other threads:[~2015-10-08 10:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 10:11 Andreas Schultz [this message]
2015-10-08 15:08 ` [PATCH net v2] fix return of iptunnel_xmit Jiri Benc
2015-10-08 15:33 ` Andreas Schultz
2015-10-08 15:39 ` Jiri Benc
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=1444299114-21345-1-git-send-email-aschultz@tpip.net \
--to=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).