All users of iptunnel_xmit expect the return value to be the packet
length on success (>0), negative for a tx error and zero for a tx
dropped error. In cset 0e6fbc5b6c6218987c93b8c7ca60cf786062899d the
negative return case was lost.
This bug was introduced when the ip_tunnel_core code was refactored.
Fixes: 0e6fbc5b6c6218987c93b8c7ca60cf786062899d
Signed-off-by: Andreas Schultz <aschu...@tpip.net>
Acked-by: Jiri Benc <jb...@redhat.com>
Acked-by: Pravin B Shelar <pshe...@nicira.com>
---
Change in v2:
- remove unused variable pkt_len
Change in v3:
- reworked based on comment from Jiri Benc
Change in v4:
- rebased to net-next to avoid merge conflicts
- added Acked-By from Jiri Benc and Pravin B Shelar
---
net/ipv4/ip_tunnel_core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 6cb9009..453d569 100644
--- 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,
__ip_select_ident(net, iph, skb_shinfo(skb)->gso_segs ?: 1);
err = ip_local_out(net, 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;
}
EXPORT_SYMBOL_GPL(iptunnel_xmit);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
